Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

update nix flake to support more platforms

Browse Source
This commit is contained in:
Green Sky 2023-09-16 23:54:51 +02:00
parent 73ee0f905b
commit f5c7261805
No known key found for this signature in database
2 changed files with 115 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
flake.lock
View File

@ -1,5 +1,23 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694553957, "lastModified": 1694553957,
@ -18,8 +36,24 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "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", "root": "root",

160
flake.nix
View File

@ -5,95 +5,97 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { self, nixpkgs }: outputs = { self, nixpkgs, flake-utils }:
let flake-utils.lib.eachDefaultSystem (system:
system = "x86_64-linux"; let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = import nixpkgs { inherit system; };
in { in {
packages.${system}.default = pkgs.stdenv.mkDerivation { packages.default = pkgs.stdenv.mkDerivation {
pname = "tomato"; pname = "tomato";
version = "0.0.0"; version = "0.0.0";
src = ./.; src = ./.;
submodules = 1; submodules = 1;
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
cmake cmake
ninja ninja
pkg-config pkg-config
patchelf patchelf
]; ];
# for some reason, buildInputs performs some magic an converts them to build dependencies, not runtime dependencies # for some reason, buildInputs performs some magic an converts them to build dependencies, not runtime dependencies
# also, non static dependencies (?? how to ensure ??) # also, non static dependencies (?? how to ensure ??)
dlopenBuildInputs = with pkgs; [ dlopenBuildInputs = with pkgs; [
xorg.libX11 xorg.libX11
xorg.libXext xorg.libXext
xorg.xorgproto xorg.xorgproto
xorg.libICE xorg.libICE
xorg.libXi xorg.libXi
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libXcursor xorg.libXcursor
xorg.libXinerama xorg.libXinerama
xorg.libXrandr xorg.libXrandr
xorg.libXxf86vm xorg.libXxf86vm
libGL libGL
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
#(libsodium.override { stdenv = pkgs.pkgsStatic.stdenv; }) #(libsodium.override { stdenv = pkgs.pkgsStatic.stdenv; })
#pkgsStatic.libsodium #pkgsStatic.libsodium
libsodium libsodium
] ++ self.packages.${system}.default.dlopenBuildInputs; ] ++ self.packages.${system}.default.dlopenBuildInputs;
# TODO: replace with install command # TODO: replace with install command
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
mv bin/tomato $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 { # copied from nixpkgs's SDL2 default.nix
#inputsFrom = with pkgs; [ SDL2 ]; # SDL is weird in that instead of just dynamically linking with
buildInputs = [ self.packages.${system}.default ]; # this makes a prebuild tomato available in the shell, do we want this? # 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"
'';
};
packages = with pkgs; [ devShells.${system}.default = pkgs.mkShell {
cmake #inputsFrom = with pkgs; [ SDL2 ];
pkg-config buildInputs = [ self.packages.${system}.default ]; # this makes a prebuild tomato available in the shell, do we want this?
];
shellHook = "echo hello to tomato dev shell!"; packages = with pkgs; [
}; cmake
pkg-config
];
apps.${system}.default = { shellHook = "echo hello to tomato dev shell!";
program = "${self.packages.${system}.default}/bin/tomato"; };
type = "app";
}; apps.default = {
}; type = "app";
program = "${self.packages.${system}.default}/bin/tomato";
};
}
);
} }