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/applications/networking | |
| 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/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-wrapper/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-wrapper/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh index 6abbf1a760b..4e2f1c5e8f1 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh +++ b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup source $makeWrapper -makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \ +makeWrapper "$firefox/bin/firefox" "$out/bin/firefox$nameSuffix" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \ --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix index 7229f510829..0b1756f21f2 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix +++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, firefox, plugins}: +args: with args; stdenv.mkDerivation { name = firefox.name + "-with-plugins"; @@ -8,6 +8,8 @@ stdenv.mkDerivation { inherit firefox; + nameSuffix = (if args ? nameSuffix then args.nameSuffix else ""); + # Let each plugin tell us (through its `mozillaPlugin') attribute # where to find the plugin in its tree. plugins = map (x: x + x.mozillaPlugin) plugins; |