summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2007-08-20 13:04:14 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2007-08-20 13:04:14 +0000
commitb5db5e6e616e7616edd82455b8597c9e3eba0723 (patch)
treef868e250606f2c7e4794190d0ce6b96f062b2b6e /pkgs
parenta6407349b1ee26f718e1cc4af5614f3fb2f7f2f0 (diff)
downloadnixpkgs-b5db5e6e616e7616edd82455b8597c9e3eba0723.tar
nixpkgs-b5db5e6e616e7616edd82455b8597c9e3eba0723.tar.gz
nixpkgs-b5db5e6e616e7616edd82455b8597c9e3eba0723.tar.bz2
nixpkgs-b5db5e6e616e7616edd82455b8597c9e3eba0723.tar.lz
nixpkgs-b5db5e6e616e7616edd82455b8597c9e3eba0723.tar.xz
nixpkgs-b5db5e6e616e7616edd82455b8597c9e3eba0723.tar.zst
nixpkgs-b5db5e6e616e7616edd82455b8597c9e3eba0723.zip
* Fix /bin/pwd and /bin/ls so that `firefox <filename>' works on
  NixOS.

svn path=/nixpkgs/trunk/; revision=9173
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/firefox/builder.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
index 66f1059d657..4fa7fbb84ab 100644
--- a/pkgs/applications/networking/browsers/firefox/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox/builder.sh
@@ -6,6 +6,11 @@ postInstall() {
     # Strip some more stuff
     strip -S $out/lib/*/* || true
 
+    # Fix some references to /bin paths in the Firefox shell script.
+    substituteInPlace $out/bin/firefox \
+        --replace /bin/pwd "$(type -tP pwd)" \
+        --replace /bin/ls "$(type -tP ls)"
+    
     # This fixes starting Firefox when there already is a running
     # instance.  The `firefox' wrapper script actually expects to be
     # in the same directory as `run-mozilla.sh', apparently.
@@ -25,6 +30,7 @@ postInstall() {
     # Put the Firefox icon in the right place.
     ensureDir $out/lib/$libDir/chrome/icons/default
     ln -s ../../../icons/default.xpm  $out/lib/$libDir/chrome/icons/default/
+    
 }
 
 genericBuild