diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-09-26 12:48:56 -0700 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-09-26 12:51:14 -0700 |
| commit | b5e86fa70094de98d721f7f32f60fa31157b066a (patch) | |
| tree | 51db3709ae9110455a773beba2830fa61e48605b /pkgs/applications/misc/firestarter | |
| parent | 90ce42821807f7476b54ed01e945317c0c14ce3d (diff) | |
| download | nixpkgs-b5e86fa70094de98d721f7f32f60fa31157b066a.tar nixpkgs-b5e86fa70094de98d721f7f32f60fa31157b066a.tar.gz nixpkgs-b5e86fa70094de98d721f7f32f60fa31157b066a.tar.bz2 nixpkgs-b5e86fa70094de98d721f7f32f60fa31157b066a.tar.lz nixpkgs-b5e86fa70094de98d721f7f32f60fa31157b066a.tar.xz nixpkgs-b5e86fa70094de98d721f7f32f60fa31157b066a.tar.zst nixpkgs-b5e86fa70094de98d721f7f32f60fa31157b066a.zip | |
firestarter: don't reference nvidia_x11 directly
It should instead be picked up at runtime from /run/opengl-driver/lib, via addOpenGLRunpath
Diffstat (limited to 'pkgs/applications/misc/firestarter')
| -rw-r--r-- | pkgs/applications/misc/firestarter/default.nix | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index b2ca9a0cab6..92c517835d8 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , fetchzip +, addOpenGLRunpath , cmake , glibc_multi , glibc @@ -9,7 +10,6 @@ , pkg-config , cudatoolkit , withCuda ? false -, linuxPackages }: let @@ -60,13 +60,23 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake git pkg-config ]; + nativeBuildInputs = [ + cmake + git + pkg-config + ] ++ lib.optionals withCuda [ + addOpenGLRunpath + ]; buildInputs = [ hwloc ] ++ (if withCuda then - [ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ] + [ glibc_multi cudatoolkit ] else [ glibc.static ]); + NIX_LDFLAGS = lib.optionals withCuda [ + "-L${cudatoolkit}/lib/stubs" + ]; + cmakeFlags = [ "-DFIRESTARTER_BUILD_HWLOC=OFF" "-DCMAKE_C_COMPILER_WORKS=1" @@ -76,8 +86,14 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out/bin cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/ + runHook postInstall + ''; + + postFixup = lib.optionalString withCuda '' + addOpenGLRunpath $out/bin/FIRESTARTER_CUDA ''; meta = with lib; { |