pyrox.dev
firestarter: don't reference nvidia_x11 directly
It should instead be picked up at runtime from /run/opengl-driver/lib,
via addOpenGLRunpath
+19
-3
pkgs/applications/misc/firestarter/default.nix
+19
-3
pkgs/applications/misc/firestarter/default.nix
···
2
2
, lib
3
3
, fetchFromGitHub
4
4
, fetchzip
5
+
, addOpenGLRunpath
5
6
, cmake
6
7
, glibc_multi
7
8
, glibc
···
9
10
, pkg-config
10
11
, cudatoolkit
11
12
, withCuda ? false
12
-
, linuxPackages
13
13
}:
14
14
15
15
let
···
60
60
fetchSubmodules = true;
61
61
};
62
62
63
-
nativeBuildInputs = [ cmake git pkg-config ];
63
+
nativeBuildInputs = [
64
+
cmake
65
+
git
66
+
pkg-config
67
+
] ++ lib.optionals withCuda [
68
+
addOpenGLRunpath
69
+
];
64
70
65
71
buildInputs = [ hwloc ] ++ (if withCuda then
66
-
[ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ]
72
+
[ glibc_multi cudatoolkit ]
67
73
else
68
74
[ glibc.static ]);
69
75
76
+
NIX_LDFLAGS = lib.optionals withCuda [
77
+
"-L${cudatoolkit}/lib/stubs"
78
+
];
79
+
70
80
cmakeFlags = [
71
81
"-DFIRESTARTER_BUILD_HWLOC=OFF"
72
82
"-DCMAKE_C_COMPILER_WORKS=1"
···
76
86
];
77
87
78
88
installPhase = ''
89
+
runHook preInstall
79
90
mkdir -p $out/bin
80
91
cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/
92
+
runHook postInstall
93
+
'';
94
+
95
+
postFixup = lib.optionalString withCuda ''
96
+
addOpenGLRunpath $out/bin/FIRESTARTER_CUDA
81
97
'';
82
98
83
99
meta = with lib; {