svn path=/nixpkgs/trunk/; revision=26460
This commit is contained in:
parent
73a66cc5e1
commit
f9ec20d6ec
|
@ -5996,12 +5996,14 @@ let
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
|
||||||
|
|
||||||
firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
|
firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
|
||||||
inherit (gtkLibs) gtk pango;
|
inherit (gtkLibs) gtk pango;
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
};
|
};
|
||||||
|
|
||||||
firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
|
firefox40Wrapper = lowPrio (wrapFirefox firefox40Pkgs.firefox "firefox" "");
|
||||||
|
|
||||||
flac = callPackage ../applications/audio/flac { };
|
flac = callPackage ../applications/audio/flac { };
|
||||||
|
|
||||||
|
|
|
@ -380,9 +380,8 @@ with (import ./release-lib.nix);
|
||||||
jdee = linux;
|
jdee = linux;
|
||||||
};
|
};
|
||||||
|
|
||||||
firefox36Pkgs = {
|
firefox36Pkgs.firefox = linux;
|
||||||
firefox = linux;
|
firefox40Pkgs.firefox = linux;
|
||||||
};
|
|
||||||
|
|
||||||
gnome = {
|
gnome = {
|
||||||
gnome_panel = linux;
|
gnome_panel = linux;
|
||||||
|
|
Loading…
Reference in a new issue