Get rid of most references to gtkLibs

svn path=/nixpkgs/trunk/; revision=33088
This commit is contained in:
Yury G. Kudryashov
2012-03-14 21:57:32 +00:00
parent fd1867ec92
commit 68fe867e19
20 changed files with 52 additions and 57 deletions
@@ -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 ];
@@ -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;
@@ -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;