summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-08-09 15:05:30 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-08-09 15:05:30 +0000
commitbf1e734f85115778ada8188094cc2581a6f221d5 (patch)
tree53957afbdf7ee75bc623554fd8ea3a45e28231c4 /pkgs/applications
parentd9ec01e77f5f344581c62ad5d26374879fc9252f (diff)
downloadnixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar
nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.gz
nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.bz2
nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.lz
nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.xz
nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.zst
nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.zip
* Don't use the subpath operator (~) anymore, it's subsumed by normal
  concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/browsers/firefox-wrapper/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
index 909a52d0a417..a63dd61b2434 100644
--- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
-  plugins = map (x: x ~ x.mozillaPlugin) plugins;
+  plugins = map (x: x + x.mozillaPlugin) plugins;
 
   meta = {
     description = firefox.meta.description + " (with various plugins)";