* Don't use the subpath operator (~) anymore, it's subsumed by normal

concatenation (+). svn path=/nixpkgs/trunk/; revision=6080
2006-08-09 15:05:30 +00:00
parent d9ec01e77f
commit bf1e734f85
9 changed files with 13 additions and 13 deletions
--- 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)";