diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2007-11-24 10:49:52 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2007-11-24 10:49:52 +0000 |
| commit | 7d7850cf032cbe275f97786b3bf4514fbf53a397 (patch) | |
| tree | 15c9fb17c8be2a85027091746e0264b72186a830 /pkgs/top-level/all-packages.nix | |
| parent | 2e7b2f8c4370e8b66001441ddab056408577dc62 (diff) | |
| download | nixpkgs-7d7850cf032cbe275f97786b3bf4514fbf53a397.tar nixpkgs-7d7850cf032cbe275f97786b3bf4514fbf53a397.tar.gz nixpkgs-7d7850cf032cbe275f97786b3bf4514fbf53a397.tar.bz2 nixpkgs-7d7850cf032cbe275f97786b3bf4514fbf53a397.tar.lz nixpkgs-7d7850cf032cbe275f97786b3bf4514fbf53a397.tar.xz nixpkgs-7d7850cf032cbe275f97786b3bf4514fbf53a397.tar.zst nixpkgs-7d7850cf032cbe275f97786b3bf4514fbf53a397.zip | |
Added possibility to make suffixed wrapped firefoxes. Yes, to have beta&release at once.
svn path=/nixpkgs/trunk/; revision=9789
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4a84aa689..1f222c3b1f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3748,7 +3748,7 @@ rec { #enableOfficialBranding = true; }); - firefoxWrapper = wrapFirefox firefox; + firefoxWrapper = wrapFirefox firefox ""; firefox3b1 = lowPrio (import ../applications/networking/browsers/firefox3b1 { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo @@ -3759,7 +3759,7 @@ rec { #enableOfficialBranding = true; }); - firefox3b1Wrapper = wrapFirefox firefox3b1; + firefox3b1Wrapper = wrapFirefox firefox3b1 ""; flac = import ../applications/audio/flac { inherit fetchurl stdenv libogg; @@ -4279,8 +4279,8 @@ rec { includeUnpack = getConfig ["stdenv" "includeUnpack"] false; }; - wrapFirefox = firefox: import ../applications/networking/browsers/firefox-wrapper { - inherit stdenv firefox; + wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { + inherit stdenv firefox nameSuffix; plugins = [] ++ lib.optional (system == "i686-linux") flashplayer # RealPlayer is disabled by default for legal reasons. |