Author: urkud
Date: Sat Jan 28 13:06:07 2012
New Revision: 31907
URL: https://nixos.org/websvn/nix/?rev=31907&sc=1
Log:
Remove glib-1.x and its reverse dependencies
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.
Deleted:
nixpkgs/trunk/pkgs/applications/audio/xmms/
nixpkgs/trunk/pkgs/development/libraries/glib/1.2.x.nix
nixpkgs/trunk/pkgs/development/libraries/glib/gcc34.patch
nixpkgs/trunk/pkgs/development/libraries/gtk+/1.2.x.nix
nixpkgs/trunk/pkgs/misc/emulators/generator/
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 28 12:44:42
2012 (r31906)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 28 13:06:07
2012 (r31907)
@@ -3690,14 +3690,6 @@
inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf;
- gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
-
- glib = callPackage ../development/libraries/glib/1.2.x.nix { };
-
- gtk = callPackage ../development/libraries/gtk+/1.2.x.nix { };
-
- });
-
gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope
pkgs.gtkLibs224; in {
glib = callPackage ../development/libraries/glib/2.28.x.nix { };
@@ -7765,12 +7757,6 @@
xineUI = callPackage ../applications/video/xine-ui { };
- xmms = callPackage ../applications/audio/xmms {
- inherit (gnome) esound;
- inherit (gtkLibs1x) glib gtk;
- stdenv = overrideGCC stdenv gcc34; # due to problems with gcc 4.x
- };
-
xneur = callPackage ../applications/misc/xneur {
GStreamer=gst_all.gstreamer;
inherit (gtkLibs) glib gtk pango atk gdk_pixbuf;
@@ -8533,10 +8519,6 @@
python = pythonFull;
};
- generator = callPackage ../misc/emulators/generator {
- inherit (gtkLibs1x) gtk;
- };
-
gensgs = callPackage_i686 ../misc/emulators/gens-gs { };
ghostscript = callPackage ../misc/ghostscript {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
