Author: raskin
Date: Tue Nov 16 23:19:08 2010
New Revision: 24715
URL: https://svn.nixos.org/websvn/nix/?rev=24715&sc=1
Log:
Correctly override cairo for firefox 4.0 beta
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 Tue Nov 16 21:05:54
2010 (r24714)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Nov 16 23:19:08
2010 (r24715)
@@ -3043,7 +3043,7 @@
});
- gtkLibs220 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs220;
in rec {
+ gtkLibs220 = recurseIntoAttrs (let callPackage = pkgs.newScope
pkgs.gtkLibs220; in rec {
glib = callPackage ../development/libraries/glib/2.24.x.nix { };
@@ -5623,9 +5623,11 @@
inherit (gnome) libIDL;
};
- firefox40Pkgs = callPackage
../applications/networking/browsers/firefox/4.0.nix {
- inherit (gtkLibs) gtk pango;
- inherit (gnome) libIDL;
+ firefox40Pkgs = let p = (applyGlobalOverrides (x : {cairo =
x.cairo_1_10_0;}));
+ in p.callPackage
+ ../applications/networking/browsers/firefox/4.0.nix {
+ inherit (p.gtkLibs) gtk pango;
+ inherit (p.gnome) libIDL;
};
firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
