Author: urkud
Date: Thu Aug 18 22:41:57 2011
New Revision: 28669
URL: https://svn.nixos.org/websvn/nix/?rev=28669&sc=1
Log:
Pull from pkgs, not rec
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 Thu Aug 18 19:50:18
2011 (r28668)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 18 22:41:57
2011 (r28669)
@@ -3449,11 +3449,9 @@
gtkmathview = callPackage ../development/libraries/gtkmathview { };
- gtkLibs = gtkLibs224;
+ gtkLibs = pkgs.gtkLibs224;
- glib = gtkLibs.glib;
- gtk = gtkLibs.gtk;
- pango = gtkLibs.pango;
+ inherit (pkgs.gtkLibs) glib gtk pango;
gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
