dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Make nixpkgs ready to gtkLibs attrset removal

Browse Source 
svn path=/nixpkgs/trunk/; revision=33091
This commit is contained in:
Yury G. Kudryashov 2012-03-14 22:44:41 +00:00
parent 6c99fad938
commit 03875e0bce
4 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/netsurf/default.nix
View File

@ -77,9 +77,9 @@ rec {
browser = import ./netsurf.nix { browser = import ./netsurf.nix {
inherit fetchurl sourceFromHead stdenv lib pkgconfig inherit fetchurl sourceFromHead stdenv lib pkgconfig
libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils
libpng libxml2 libCSS lcms curl libmng; libpng libxml2 libCSS lcms curl libmng glib gtk;
libharu = netsurfHaru; libharu = netsurfHaru;
inherit (gnome) glib gtk libglade; inherit (gnome) libglade;
}; };

4
pkgs/games/dwarf-fortress/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gnomegtk, glib, mesa, openal, glibc, libsndfile}: {stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile}:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
ln -s \$DF_DIR/save \$DF_DIR/data/ ln -s \$DF_DIR/save \$DF_DIR/data/
# now run Dwarf Fortress! # now run Dwarf Fortress!
export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gnomegtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/ export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/
\$DF_DIR/df "\$@" \$DF_DIR/df "\$@"
EOF EOF

42
pkgs/top-level/all-packages.nix
View File

@ -1436,9 +1436,7 @@ let
udftools = callPackage ../tools/filesystems/udftools {}; udftools = callPackage ../tools/filesystems/udftools {};
ufraw = callPackage ../applications/graphics/ufraw { ufraw = callPackage ../applications/graphics/ufraw { };
inherit (gnome) gtk;
};
unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
@ -3707,9 +3705,7 @@ let
gss = callPackage ../development/libraries/gss { }; gss = callPackage ../development/libraries/gss { };
gtkimageview = callPackage ../development/libraries/gtkimageview { gtkimageview = callPackage ../development/libraries/gtkimageview { };
inherit (gnome) gtk;
};
gtkmathview = callPackage ../development/libraries/gtkmathview { }; gtkmathview = callPackage ../development/libraries/gtkmathview { };
@ -3745,7 +3741,6 @@ let
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
inherit (gnome) gtk;
gtksharp = gtksharp2; gtksharp = gtksharp2;
}; };
@ -3992,7 +3987,6 @@ let
libexosip = callPackage ../development/libraries/exosip {}; libexosip = callPackage ../development/libraries/exosip {};
libextractor = callPackage ../development/libraries/libextractor { libextractor = callPackage ../development/libraries/libextractor {
inherit (gnome) gtk;
libmpeg2 = mpeg2dec; libmpeg2 = mpeg2dec;
}; };
@ -4548,7 +4542,7 @@ let
qt48 = callPackage ../development/libraries/qt-4.x/4.8 { qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
# GNOME dependencies are not used unless gtkStyle == true # GNOME dependencies are not used unless gtkStyle == true
inherit (pkgs.gnome) gtk libgnomeui GConf gnome_vfs; inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
# GStreamer is required for HTML5 video in QtWebKit # GStreamer is required for HTML5 video in QtWebKit
inherit (pkgs.gst_all) gstreamer gstPluginsBase; inherit (pkgs.gst_all) gstreamer gstPluginsBase;
}; };
@ -5742,7 +5736,7 @@ let
systemtap = callPackage ../development/tools/profiling/systemtap { systemtap = callPackage ../development/tools/profiling/systemtap {
linux = kernel; linux = kernel;
inherit (gnome) gtkmm libglademm; inherit (gnome) libglademm;
}; };
v86d = callPackage ../os-specific/linux/v86d { }; v86d = callPackage ../os-specific/linux/v86d { };
@ -5883,7 +5877,7 @@ let
}; };
phat = callPackage ../development/libraries/phat { phat = callPackage ../development/libraries/phat {
inherit (gnome) gtk libgnomecanvas; inherit (gnome) libgnomecanvas;
}; };
pmount = callPackage ../os-specific/linux/pmount { }; pmount = callPackage ../os-specific/linux/pmount { };
@ -6398,7 +6392,7 @@ let
darcs = haskellPackages.darcs; darcs = haskellPackages.darcs;
darktable = callPackage ../applications/graphics/darktable { darktable = callPackage ../applications/graphics/darktable {
inherit (gnome) GConf libglade atk; inherit (gnome) GConf libglade;
}; };
dia = callPackage ../applications/graphics/dia { dia = callPackage ../applications/graphics/dia {
@ -6557,7 +6551,7 @@ let
esniper = callPackage ../applications/networking/esniper { }; esniper = callPackage ../applications/networking/esniper { };
etherape = callPackage ../applications/networking/sniffers/etherape { etherape = callPackage ../applications/networking/sniffers/etherape {
inherit (gnome) gnomedocutils libgnome libglade gtk libgnomeui scrollkeeper; inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
}; };
evopedia = callPackage ../applications/misc/evopedia { }; evopedia = callPackage ../applications/misc/evopedia { };
@ -6688,7 +6682,7 @@ let
get_iplayer = callPackage ../applications/misc/get_iplayer {}; get_iplayer = callPackage ../applications/misc/get_iplayer {};
gimp = callPackage ../applications/graphics/gimp { gimp = callPackage ../applications/graphics/gimp {
inherit (gnome) gtk libart_lgpl; inherit (gnome) libart_lgpl;
}; };
gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins { gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
@ -6738,7 +6732,7 @@ let
}; };
gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix { gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix {
inherit (gnome) gtk libglade; inherit (gnome) libglade;
guile = guile_1_8; guile = guile_1_8;
gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true; gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true;
}; };
@ -6824,14 +6818,14 @@ let
i810switch = callPackage ../os-specific/linux/i810switch { }; i810switch = callPackage ../os-specific/linux/i810switch { };
icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (gnome) libIDL libgnomeui gnome_vfs;
inherit (xlibs) pixman; inherit (xlibs) pixman;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });
icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 {
application = "xulrunner"; application = "xulrunner";
inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (gnome) libIDL libgnomeui gnome_vfs;
inherit (xlibs) pixman; inherit (xlibs) pixman;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });
@ -7296,7 +7290,7 @@ let
sox = callPackage ../applications/misc/audio/sox { }; sox = callPackage ../applications/misc/audio/sox { };
specimen = callPackage ../applications/audio/specimen { specimen = callPackage ../applications/audio/specimen {
inherit (gnome) gtk libgnomecanvas; inherit (gnome) libgnomecanvas;
}; };
spotify = callPackage ../applications/audio/spotify { }; spotify = callPackage ../applications/audio/spotify { };
@ -7673,9 +7667,7 @@ let
crrcsim = callPackage ../games/crrcsim {}; crrcsim = callPackage ../games/crrcsim {};
dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { };
gnomegtk = pkgsi686Linux.gnome.gtk;
};
eduke32 = callPackage ../games/eduke32 { }; eduke32 = callPackage ../games/eduke32 { };
@ -8090,8 +8082,8 @@ let
### SCIENCE/GEOMETRY ### SCIENCE/GEOMETRY
drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
inherit (gnome) libglade gtk; inherit (gnome) libglade;
inherit libxml2 perl intltool libtool pkgconfig; inherit libxml2 perl intltool libtool pkgconfig gtk;
guile = guile_1_8; guile = guile_1_8;
}; };
@ -8317,9 +8309,9 @@ let
gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) {
inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject
pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy
docutils; docutils gtk;
dbus = dbus.libs; dbus = dbus.libs;
inherit (gnome) gtk libglade; inherit (gnome) libglade;
inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11
scrnsaverproto; scrnsaverproto;
python = pythonFull; python = pythonFull;

2
pkgs/top-level/haskell-packages.nix
View File

@ -719,7 +719,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
glade = callPackage ../development/libraries/haskell/glade { glade = callPackage ../development/libraries/haskell/glade {
inherit (pkgs.gnome) libglade; inherit (pkgs.gnome) libglade;
gtkC = pkgs.gnome.gtk; gtkC = pkgs.gtk;
libc = pkgs.stdenv.gcc.libc; libc = pkgs.stdenv.gcc.libc;
}; };