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
, lib
3
, fetchFromGitHub
4
, fetchzip
5
, cmake
6
, glibc_multi
7
, glibc
···
9
, pkg-config
10
, cudatoolkit
11
, withCuda ? false
12
-
, linuxPackages
13
}:
14
15
let
···
60
fetchSubmodules = true;
61
};
62
63
-
nativeBuildInputs = [ cmake git pkg-config ];
64
65
buildInputs = [ hwloc ] ++ (if withCuda then
66
-
[ glibc_multi cudatoolkit linuxPackages.nvidia_x11 ]
67
else
68
[ glibc.static ]);
69
70
cmakeFlags = [
71
"-DFIRESTARTER_BUILD_HWLOC=OFF"
72
"-DCMAKE_C_COMPILER_WORKS=1"
···
76
];
77
78
installPhase = ''
79
mkdir -p $out/bin
80
cp src/FIRESTARTER${lib.optionalString withCuda "_CUDA"} $out/bin/
81
'';
82
83
meta = with lib; {
···
2
, lib
3
, fetchFromGitHub
4
, fetchzip
5
+
, addOpenGLRunpath
6
, cmake
7
, glibc_multi
8
, glibc
···
10
, pkg-config
11
, cudatoolkit
12
, withCuda ? false
13
}:
14
15
let
···
60
fetchSubmodules = true;
61
};
62
63
+
nativeBuildInputs = [
64
+
cmake
65
+
git
66
+
pkg-config
67
+
] ++ lib.optionals withCuda [
68
+
addOpenGLRunpath
69
+
];
70
71
buildInputs = [ hwloc ] ++ (if withCuda then
72
+
[ glibc_multi cudatoolkit ]
73
else
74
[ glibc.static ]);
75
76
+
NIX_LDFLAGS = lib.optionals withCuda [
77
+
"-L${cudatoolkit}/lib/stubs"
78
+
];
79
+
80
cmakeFlags = [
81
"-DFIRESTARTER_BUILD_HWLOC=OFF"
82
"-DCMAKE_C_COMPILER_WORKS=1"
···
86
];
87
88
installPhase = ''
89
+
runHook preInstall
90
mkdir -p $out/bin
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
97
'';
98
99
meta = with lib; {