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

Added possibility to make suffixed wrapped firefoxes. Yes, to have beta&release at once.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9884
This commit is contained in:
Yury G. Kudryashov 2007-12-08 01:08:29 +00:00
parent d1cc8aafd0
commit 7aea2477a1
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
View File

@ -1,7 +1,7 @@
source $stdenv/setup source $stdenv/setup
source $makeWrapper source $makeWrapper
makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \ makeWrapper "$firefox/bin/firefox" "$out/bin/firefox$nameSuffix" \
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
--suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \ --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \
--suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"

4
pkgs/applications/networking/browsers/firefox-wrapper/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, firefox, plugins}: args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = firefox.name + "-with-plugins"; name = firefox.name + "-with-plugins";
@ -8,6 +8,8 @@ stdenv.mkDerivation {
inherit firefox; inherit firefox;
nameSuffix = (if args ? nameSuffix then args.nameSuffix else "");
# Let each plugin tell us (through its `mozillaPlugin') attribute # Let each plugin tell us (through its `mozillaPlugin') attribute
# where to find the plugin in its tree. # where to find the plugin in its tree.
plugins = map (x: x + x.mozillaPlugin) plugins; plugins = map (x: x + x.mozillaPlugin) plugins;

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

@ -3557,7 +3557,7 @@ rec {
#enableOfficialBranding = true; #enableOfficialBranding = true;
}); });
firefoxWrapper = wrapFirefox firefox; firefoxWrapper = wrapFirefox firefox "";
firefox3b1 = lowPrio (import ../applications/networking/browsers/firefox3b1 { firefox3b1 = lowPrio (import ../applications/networking/browsers/firefox3b1 {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
@ -3568,7 +3568,7 @@ rec {
#enableOfficialBranding = true; #enableOfficialBranding = true;
}); });
firefox3b1Wrapper = wrapFirefox firefox3b1; firefox3b1Wrapper = wrapFirefox firefox3b1 "";
flac = import ../applications/audio/flac { flac = import ../applications/audio/flac {
inherit fetchurl stdenv libogg; inherit fetchurl stdenv libogg;
@ -4088,8 +4088,8 @@ rec {
includeUnpack = getConfig ["stdenv" "includeUnpack"] false; includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
}; };
wrapFirefox = firefox: import ../applications/networking/browsers/firefox-wrapper { wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
inherit stdenv firefox; inherit stdenv firefox nameSuffix;
plugins = [] plugins = []
++ lib.optional (system == "i686-linux") flashplayer ++ lib.optional (system == "i686-linux") flashplayer
# RealPlayer is disabled by default for legal reasons. # RealPlayer is disabled by default for legal reasons.