about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-03-14 07:28:34 +0000
committerJörg Thalheim <joerg@thalheim.io>2020-03-14 07:32:31 +0000
commit841b89cac85398ca49591bc7d7bc21655a8aaf83 (patch)
tree59601d6892581257ae964366a0b7df218a23af82
parent784740aee0657a556f44fc465405a4f28401ffe0 (diff)
downloadnixlib-841b89cac85398ca49591bc7d7bc21655a8aaf83.tar
nixlib-841b89cac85398ca49591bc7d7bc21655a8aaf83.tar.gz
nixlib-841b89cac85398ca49591bc7d7bc21655a8aaf83.tar.bz2
nixlib-841b89cac85398ca49591bc7d7bc21655a8aaf83.tar.lz
nixlib-841b89cac85398ca49591bc7d7bc21655a8aaf83.tar.xz
nixlib-841b89cac85398ca49591bc7d7bc21655a8aaf83.tar.zst
nixlib-841b89cac85398ca49591bc7d7bc21655a8aaf83.zip
mc: add autoreconfHook instead of /usr/bin/file patch
The error is still there but harmless.
It should be rather fixed in autoconf than in every package that
uses autotools.
-rw-r--r--pkgs/tools/misc/mc/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 42e155fcaf29..60bc153c83f8 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -15,6 +15,7 @@
 , libssh2
 , openssl
 , coreutils
+, autoreconfHook
 }:
 
 stdenv.mkDerivation rec {
@@ -26,17 +27,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5";
   };
 
-  preConfigure = ''
-    for f in \
-      ./configure \
-      ./config/ltmain.sh \
-      ./m4/libtool.m4 \
-      ; do
-      substituteInPlace $f --replace /usr/bin/file ${file}/bin/file
-    done
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   buildInputs = [
     file