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

Correctly override cairo for firefox 4.0 beta

Browse Source 
svn path=/nixpkgs/trunk/; revision=24715
This commit is contained in:
Michael Raskin 2010-11-16 23:19:08 +00:00
parent e59ddf7bcb
commit 52ea4804e2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3043,7 +3043,7 @@ let
});
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 @@ let
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" "";