[Nix-dev] commit review (ludo, Karn, eelco)

[Shea Levy]

On 3/15/11 11:31 PM, Marc Weber wrote:
> 3) eelco
>
> 3) merge failure (xorg-updates)
>
>      -  firefox40Pkgs = let p = (applyGlobalOverrides (x : {cairo = x.cairo_1_10_0;}));
>      -  in p.callPackage
>      -      ../applications/networking/browsers/firefox/4.0.nix {
>      +  firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
>           inherit (p.gtkLibs) gtk pango;
>           inherit (p.gnome) libIDL;
>         };
>

This pinpoints the source of my problem in the previous thread. Removing 
the p. and seeing what happens.