tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
nvidia-settings: Make sure binary can find libXv.so
Mateusz Kowalczyk
8 years ago
34b0c1c4
8bcd9480
+2
-5
1 changed file
expand all
collapse all
unified
split
pkgs
os-specific
linux
nvidia-x11
settings.nix
+2
-5
pkgs/os-specific/linux/nvidia-x11/settings.nix
···
41
42
nativeBuildInputs = [ pkgconfig m4 ];
43
44
-
buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ]
45
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
46
-
47
-
# This next line makes the nvidia-settings binary fail to compile as of version 387.22
48
-
# NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];
49
50
makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
51
installFlags = [ "PREFIX=$(out)" ];
···
74
binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
75
76
postFixup = ''
77
-
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \
78
$out/bin/$binaryName
79
'';
80
···
41
42
nativeBuildInputs = [ pkgconfig m4 ];
43
44
+
buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus libXv ]
45
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
0
0
0
46
47
makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
48
installFlags = [ "PREFIX=$(out)" ];
···
71
binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
72
73
postFixup = ''
74
+
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
75
$out/bin/$binaryName
76
'';
77