about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2008-02-10 17:38:46 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2008-02-10 17:38:46 +0000
commit7753a1c5e970110ad6946b38fb019dca3ffad01a (patch)
treeeff408889f22ca008268b7e4729bbb314366dcde
parentd8688a1eb92ea5f9fd32d880c47361be6121259c (diff)
downloadnixlib-7753a1c5e970110ad6946b38fb019dca3ffad01a.tar
nixlib-7753a1c5e970110ad6946b38fb019dca3ffad01a.tar.gz
nixlib-7753a1c5e970110ad6946b38fb019dca3ffad01a.tar.bz2
nixlib-7753a1c5e970110ad6946b38fb019dca3ffad01a.tar.lz
nixlib-7753a1c5e970110ad6946b38fb019dca3ffad01a.tar.xz
nixlib-7753a1c5e970110ad6946b38fb019dca3ffad01a.tar.zst
nixlib-7753a1c5e970110ad6946b38fb019dca3ffad01a.zip
* Remove a time-dependent impurity from mc which was caused by touching all the source files. Depending on whether files were touched in the same second things would either be rebuilt (which would fail) or not.
  Maybe this breaks unzip support, not tested.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10587
-rw-r--r--pkgs/tools/misc/mc/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index b82ad4cd3e6f..344e8a5ceeaf 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -8,15 +8,12 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [pkgconfig glib ncurses libX11 shebangfix perl zip];
   configureFlags = "--with-screen=ncurses";
-  # small hacks to support zip
-  postUnpack = "
-    sed  -i 's=/usr/bin/==g' `find -type f`
-  ";
-  postInstall = "
-    find \$out -iname \"*.pl\" | xargs shebangfix;
-  ";
+  makeFlags = "UNZIP=unzip";
+  postInstall = ''
+    find $out -iname "*.pl" | xargs shebangfix;
+  '';
   meta = {
-	  description = "File Manager and User Shell for the GNU Project";
-	  homepage = http://www.ibiblio.org/mc;
+    description = "File Manager and User Shell for the GNU Project";
+    homepage = http://www.ibiblio.org/mc;
   };
 }