public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvidia-x11: Use GTK 2

Browse Source 
Otherwise we end up with multiple versions of GTK in the system
closure. Also, GTK 3 is not well integrated in NixOS yet (e.g. it
doesn't respect KDE's colour scheme).
This commit is contained in:
Eelco Dolstra 2015-02-28 13:49:25 +01:00
parent 38b53b8e7d
commit 06dfa19b99
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -68,7 +68,6 @@ installPhase() {
#patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
#patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
if test -z "$libsOnly"; then if test -z "$libsOnly"; then
# Install headers and /share files etc. # Install headers and /share files etc.
mkdir -p $out/include/nvidia mkdir -p $out/include/nvidia
@ -99,15 +98,16 @@ installPhase() {
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done done
patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.* patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.*
# Test a bit. # Test a bit.
$out/bin/nvidia-settings --version $out/bin/nvidia-settings --version
else else
rm $out/lib/libnvidia-gtk3.* rm $out/lib/libnvidia-gtk2.*
fi fi
# for simplicity and dependency reduction, don't support the gtk2 interface
rm $out/lib/libnvidia-gtk2.* # For simplicity and dependency reduction, don't support the gtk3 interface.
rm $out/lib/libnvidia-gtk3.*
} }

7
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
, gtk3, atk, pango, glib, gdk_pixbuf, cairo , gtk, atk, pango, glib, gdk_pixbuf, cairo
, # Whether to build the libraries only (i.e. not the kernel module or , # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit # nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux. # Linux.
@ -48,9 +48,8 @@ stdenv.mkDerivation {
openclPath = makeLibraryPath [zlib]; openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc];
# we don't support the gtk2 version gtkPath = optionalString (!libsOnly) (makeLibraryPath
gtk3Path = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf cairo ] );
[ gtk3 atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xlibs.libXv ]; programPath = makeLibraryPath [ xlibs.libXv ];
buildInputs = [ perl ]; buildInputs = [ perl ];