diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 21:57:32 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 21:57:32 +0000 |
| commit | 68fe867e195626ede48975ea6d65a239392b4ca2 (patch) | |
| tree | 41b401afa6bca8fb76816fd9d8f856cb3a19a0b5 /pkgs/os-specific/linux/nvidia-x11 | |
| parent | fd1867ec922cfa228cb73494c3a39e7031da01d8 (diff) | |
| download | nixlib-68fe867e195626ede48975ea6d65a239392b4ca2.tar nixlib-68fe867e195626ede48975ea6d65a239392b4ca2.tar.gz nixlib-68fe867e195626ede48975ea6d65a239392b4ca2.tar.bz2 nixlib-68fe867e195626ede48975ea6d65a239392b4ca2.tar.lz nixlib-68fe867e195626ede48975ea6d65a239392b4ca2.tar.xz nixlib-68fe867e195626ede48975ea6d65a239392b4ca2.tar.zst nixlib-68fe867e195626ede48975ea6d65a239392b4ca2.zip | |
Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/legacy96.nix | 7 |
3 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 23d1062cc398..0243dcb88d41 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, gtkLibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +, gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -38,7 +39,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib gtkLibs.gdk_pixbuf xlibs.libXv ] ); + [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 541e442f6b17..4b30137f5b64 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: +{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}: let @@ -32,10 +32,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; - programPath = stdenv.lib.makeLibraryPath [ - gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib - xlibs.libXv - ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index a7ba4d5ca956..156484f53e1f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: +{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}: let @@ -32,10 +32,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; - programPath = stdenv.lib.makeLibraryPath [ - gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib - xlibs.libXv - ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; |