From c583b8389bcd6f155a0b33a48adacc6e80a02535 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Feb 2008 09:34:39 +0000 Subject: [PATCH] * 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/trunk/; revision=10500 --- pkgs/tools/misc/mc/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 78f5259a8898..8f03756a2d3b 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -8,16 +8,13 @@ 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; }; }