Compare commits
2 Commits
0b46b891c2
...
f5c7261805
Author | SHA1 | Date | |
---|---|---|---|
f5c7261805 | |||
73ee0f905b |
4
.gitignore
vendored
4
.gitignore
vendored
@ -11,6 +11,7 @@ cmake-build-release/
|
|||||||
*.coredump
|
*.coredump
|
||||||
compile_commands.json
|
compile_commands.json
|
||||||
/build*
|
/build*
|
||||||
|
/result*
|
||||||
.clangd
|
.clangd
|
||||||
.cache
|
.cache
|
||||||
|
|
||||||
@ -20,3 +21,6 @@ compile_commands.json
|
|||||||
|
|
||||||
CMakeLists.txt.user*
|
CMakeLists.txt.user*
|
||||||
CMakeCache.txt
|
CMakeCache.txt
|
||||||
|
|
||||||
|
*.tox
|
||||||
|
imgui.ini
|
||||||
|
61
flake.lock
generated
Normal file
61
flake.lock
generated
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1694529238,
|
||||||
|
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1694553957,
|
||||||
|
"narHash": "sha256-8o15HEax53lBJjjcr5VHMpuuT6vBcrzSNB6y2iGlPaU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "e7fe745d22df5fa282b321e577fe18d4f62e0f0b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "release-23.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
101
flake.nix
Normal file
101
flake.nix
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
{
|
||||||
|
description = "tomato flake";
|
||||||
|
# bc flakes and git submodules dont really like each other, you need to
|
||||||
|
# append '.?submodules=1' to the nix commands.
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
|
||||||
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs, flake-utils }:
|
||||||
|
flake-utils.lib.eachDefaultSystem (system:
|
||||||
|
let
|
||||||
|
pkgs = import nixpkgs { inherit system; };
|
||||||
|
in {
|
||||||
|
packages.default = pkgs.stdenv.mkDerivation {
|
||||||
|
pname = "tomato";
|
||||||
|
version = "0.0.0";
|
||||||
|
|
||||||
|
src = ./.;
|
||||||
|
submodules = 1;
|
||||||
|
|
||||||
|
nativeBuildInputs = with pkgs; [
|
||||||
|
cmake
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
patchelf
|
||||||
|
];
|
||||||
|
|
||||||
|
# for some reason, buildInputs performs some magic an converts them to build dependencies, not runtime dependencies
|
||||||
|
# also, non static dependencies (?? how to ensure ??)
|
||||||
|
dlopenBuildInputs = with pkgs; [
|
||||||
|
xorg.libX11
|
||||||
|
xorg.libXext
|
||||||
|
xorg.xorgproto
|
||||||
|
xorg.libICE
|
||||||
|
xorg.libXi
|
||||||
|
xorg.libXScrnSaver
|
||||||
|
xorg.libXcursor
|
||||||
|
xorg.libXinerama
|
||||||
|
xorg.libXrandr
|
||||||
|
xorg.libXxf86vm
|
||||||
|
libGL
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
#(libsodium.override { stdenv = pkgs.pkgsStatic.stdenv; })
|
||||||
|
#pkgsStatic.libsodium
|
||||||
|
libsodium
|
||||||
|
] ++ self.packages.${system}.default.dlopenBuildInputs;
|
||||||
|
|
||||||
|
# TODO: replace with install command
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
mv bin/tomato $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
# copied from nixpkgs's SDL2 default.nix
|
||||||
|
# SDL is weird in that instead of just dynamically linking with
|
||||||
|
# libraries when you `--enable-*` (or when `configure` finds) them
|
||||||
|
# it `dlopen`s them at runtime. In principle, this means it can
|
||||||
|
# ignore any missing optional dependencies like alsa, pulseaudio,
|
||||||
|
# some x11 libs, wayland, etc if they are missing on the system
|
||||||
|
# and/or work with wide array of versions of said libraries. In
|
||||||
|
# nixpkgs, however, we don't need any of that. Moreover, since we
|
||||||
|
# don't have a global ld-cache we have to stuff all the propagated
|
||||||
|
# libraries into rpath by hand or else some applications that use
|
||||||
|
# SDL API that requires said libraries will fail to start.
|
||||||
|
#
|
||||||
|
# You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to
|
||||||
|
# list the symbols used in this way.
|
||||||
|
# TODO: only patch if building FOR nix (like not for when static building)
|
||||||
|
postFixup =
|
||||||
|
let
|
||||||
|
#rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs);
|
||||||
|
rpath = nixpkgs.lib.makeLibraryPath (self.packages.${system}.default.dlopenBuildInputs);
|
||||||
|
in
|
||||||
|
nixpkgs.lib.optionalString (pkgs.stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''
|
||||||
|
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/tomato):${rpath}" "$out/bin/tomato"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
devShells.${system}.default = pkgs.mkShell {
|
||||||
|
#inputsFrom = with pkgs; [ SDL2 ];
|
||||||
|
buildInputs = [ self.packages.${system}.default ]; # this makes a prebuild tomato available in the shell, do we want this?
|
||||||
|
|
||||||
|
packages = with pkgs; [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
shellHook = "echo hello to tomato dev shell!";
|
||||||
|
};
|
||||||
|
|
||||||
|
apps.default = {
|
||||||
|
type = "app";
|
||||||
|
program = "${self.packages.${system}.default}/bin/tomato";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user