From 68fe867e195626ede48975ea6d65a239392b4ca2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Mar 2012 21:57:32 +0000 Subject: [PATCH] Get rid of most references to gtkLibs svn path=/nixpkgs/trunk/; revision=33088 --- .../applications/graphics/gimp/plugins/default.nix | 3 +-- pkgs/applications/graphics/k3d/default.nix | 14 +++++++------- pkgs/applications/misc/adobe-reader/default.nix | 11 +++-------- .../networking/browsers/chromium/default.nix | 5 +++-- .../mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- pkgs/applications/networking/dropbox/default.nix | 9 +++++---- .../instant-messengers/oneteam/default.nix | 6 +++--- pkgs/desktops/xfce-4.6/default.nix | 2 +- pkgs/desktops/xfce-4.8/default.nix | 2 +- pkgs/misc/emulators/gens-gs/default.nix | 4 ++-- pkgs/misc/emulators/mess/default.nix | 4 ++-- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++-- pkgs/os-specific/linux/nvidia-x11/default.nix | 5 +++-- pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 7 ++----- pkgs/os-specific/linux/nvidia-x11/legacy96.nix | 7 ++----- pkgs/tools/X11/bumblebee/default.nix | 4 ++-- pkgs/tools/admin/gtk-vnc/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++++++-- pkgs/top-level/haskell-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 20 files changed, 52 insertions(+), 57 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b80d27bfcf9b..70a27030969b 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,8 +5,7 @@ { pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs; - inherit (gtkLibs) glib; + inherit (pkgs) stdenv fetchurl pkgconfig glib; targetPluginDir = "$out/${gimp.name}-plugins"; targetScriptDir = "$out/${gimp.name}-scripts"; prefix = "plugin-gimp-"; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index c1579579d813..db6288f4cf11 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, gtkLibs, gnome - , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype - , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff - , gettext, intltool, perl - }: +{stdenv, fetchurl +, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff +, gettext, intltool, perl, gtkmm, glibmm, gtkglext +}: stdenv.mkDerivation rec { version = "0.8.0.2"; name = "k3d-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/k3d/K-3D%20Source/K-3D%200.8.0.2/k3d-source-0.8.0.2.tar.bz2"; + url = "mirror://sourceforge/k3d/k3d-source-0.8.0.2.tar.bz2"; sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" ''; - buildInputs = with gtkLibs; with gnome; [ + buildInputs = [ cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 25bce4203eed..6eaf976faa46 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libX11, cups, gtkLibs, zlib, libxml2 }: +{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib +, gdk_pixbuf }: assert stdenv.system == "i686-linux"; @@ -17,13 +18,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc libX11 zlib libxml2 cups - gtkLibs.pango - gtkLibs.atk - gtkLibs.gtk - gtkLibs.glib - gtkLibs.gdk_pixbuf - ]; + [ stdenv.gcc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; meta = { description = "Adobe Reader, a viewer for PDF documents"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3fffc68b6b2e..a73f87b4a533 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,6 @@ { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat -, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11, libXfixes +, fetchurl, ffmpeg, fontconfig, freetype, libX11, libXfixes +, glib, gtk, gdk_pixbuf, pango , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf , stdenv, unzip, zlib, pam, pcre }: @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc - gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango + glib gtk gdk_pixbuf pango pam ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index eae84d9c3a6d..821ddbd3dad8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -21,9 +21,9 @@ let ]; rpath32 = makeLibraryPath - [ pkgsi686Linux.gtkLibs.gdk_pixbuf - pkgsi686Linux.gtkLibs.glib - pkgsi686Linux.gtkLibs.gtk + [ pkgsi686Linux.gdk_pixbuf + pkgsi686Linux.glib + pkgsi686Linux.gtk pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXcomposite pkgsi686Linux.xorg.libXfixes diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 936fedd1491e..f8d97a4f167c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, makeDesktopItem -, xlibs, gtkLibs, gnome +, libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage +, libXfixes, libXi, libXinerama, libXrandr, libXrender , dbus, dbus_glib, fontconfig, gcc, patchelf +, atk, glib, gdk_pixbuf, gtk, pango }: # this package contains the daemon version of dropbox @@ -28,8 +30,7 @@ let # Libraries referenced by dropbox binary. # Be aware that future versions of the dropbox binary may refer # to different versions than are currently in these packages. - ldpath = with xlibs; with gtkLibs; with gnome; - stdenv.lib.makeSearchPath "lib" [ + ldpath = stdenv.lib.makeSearchPath "lib" [ libSM libX11 libXext libXcomposite libXcursor libXdamage libXfixes libXi libXinerama libXrandr libXrender atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf @@ -83,4 +84,4 @@ in stdenv.mkDerivation { description = "Online stored folders (daemon version)"; homepage = http://www.dropbox.com; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 026ab3fff1c5..3549d7f14996 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -1,16 +1,16 @@ x@{builderDefsPackage , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig - , pulseaudio, gtkLibs, pixman, nspr, nss, libXScrnSaver, scrnsaverproto + , pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto , ...}: builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["fetchgit" "perlPackages" "gtkLibs"]; + ["fetchgit" "perlPackages"]; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [ - a.perlPackages.SubName a.gtkLibs.gtk a.gtkLibs.glib + a.perlPackages.SubName a.gtk a.glib ]; sourceInfo = rec { baseName="oneteam"; diff --git a/pkgs/desktops/xfce-4.6/default.nix b/pkgs/desktops/xfce-4.6/default.nix index 6f2eaf1b4bfe..1769c3f7a041 100644 --- a/pkgs/desktops/xfce-4.6/default.nix +++ b/pkgs/desktops/xfce-4.6/default.nix @@ -1,7 +1,7 @@ { callPackage, pkgs }: rec { - inherit (pkgs.gtkLibs) gtk glib; + inherit (pkgs) gtk glib; #### CORE diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 971071c3accb..8e6f7c10234c 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -1,7 +1,7 @@ { callPackage, pkgs }: rec { - inherit (pkgs.gtkLibs) gtk glib; + inherit (pkgs) gtk glib; #### SUPPORT diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index a6f457b52109..217468c5bd2a 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkLibs, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtkLibs.gtk SDL nasm zlib libpng mesa ]; + buildInputs = [ pkgconfig gtk SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 150042ad7963..990f1e7106e1 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtkLibs, gnome, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtkLibs.gtk gnome.GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk GConf mesa expat zlib ]; installPhase = '' diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index c6aa7baea2fe..9910768b5470 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - cmake, dbus_glib, glib, gtk, gtkLibs, pkgconfig, xorg }: + cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { version = "1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "66d571f08ec999f56de412f42a0395c9dc60b73adaaece96c6da6e98353fe379"; }; - buildInputs = [ cmake dbus_glib glib gtk gtkLibs.gdk_pixbuf + buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.pixman ]; 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; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 2e0c700641f7..74e3e7b1f82d 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -28,7 +28,7 @@ # package, and parameterize the two wrappers as well) { stdenv, fetchurl, pkgconfig, help2man -, libX11, glibc, gtkLibs, libbsd +, libX11, glibc, glib, libbsd , makeWrapper, buildEnv, module_init_tools , linuxPackages, virtualgl, xorg, xkeyboard_config }: @@ -98,7 +98,7 @@ in stdenv.mkDerivation { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 gtkLibs.glib libbsd ]; + buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ]; # create a wrapper environment for bumblebeed and optirun postInstall = '' diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 036389babe23..1fda870d5fbb 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -7,7 +7,7 @@ builderDefsPackage (a : let helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefox36Pkgs" "gtkLibs"]; + ["perlPackages" "firefox36Pkgs"]; buildInputs = (map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames))) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cdae5c5bc96..bce46f6e2f3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6897,7 +6897,9 @@ let jwm = callPackage ../applications/window-managers/jwm { }; - k3d = callPackage ../applications/graphics/k3d {}; + k3d = callPackage ../applications/graphics/k3d { + inherit (pkgs.gnome) gtkglext; + }; keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; @@ -8358,7 +8360,9 @@ let maven2 = callPackage ../misc/maven { }; maven3 = callPackage ../misc/maven/3.0.nix { }; - mess = callPackage ../misc/emulators/mess { }; + mess = callPackage ../misc/emulators/mess { + inherit (pkgs.gnome) GConf; + }; mupen64plus = callPackage ../misc/emulators/mupen64plus { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b9723724f7ac..148ee5c39849 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -751,7 +751,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_0_0; gtk = callPackage ../development/libraries/haskell/gtk { - inherit (pkgs.gtkLibs) gtk; + inherit (pkgs) gtk; libc = pkgs.stdenv.gcc.libc; }; @@ -1068,7 +1068,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; pango = callPackage ../development/libraries/haskell/pango { - inherit (pkgs.gtkLibs) pango; + inherit (pkgs) pango; libc = pkgs.stdenv.gcc.libc; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e8b8b9f8ac2..7d1b828a608b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1006,7 +1006,7 @@ let pythonPackages = python.modules // rec { sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; - buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ]; + buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";