diff options
| author | eburimu <urusan80@gmail.com> | 2018-11-28 00:13:19 +0300 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-11-29 17:52:20 +0000 |
| commit | cfb184f2cb81e32639564597a0bf820a6595900e (patch) | |
| tree | a81e1415b3002ddb145c9855b950c83a63f1c3b0 /pkgs/tools | |
| parent | ca11db894f2a8c91a950d9ec326c3977770b766c (diff) | |
| download | nixlib-cfb184f2cb81e32639564597a0bf820a6595900e.tar nixlib-cfb184f2cb81e32639564597a0bf820a6595900e.tar.gz nixlib-cfb184f2cb81e32639564597a0bf820a6595900e.tar.bz2 nixlib-cfb184f2cb81e32639564597a0bf820a6595900e.tar.lz nixlib-cfb184f2cb81e32639564597a0bf820a6595900e.tar.xz nixlib-cfb184f2cb81e32639564597a0bf820a6595900e.tar.zst nixlib-cfb184f2cb81e32639564597a0bf820a6595900e.zip | |
fix reiserfsprogs cross compilation
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/reiserfsprogs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index e23dd5f0bd14..345974bed58d 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libuuid }: +{ stdenv, fetchurl, libuuid, autoreconfHook }: let version = "3.6.24"; in stdenv.mkDerivation rec { @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y"; }; + patches = [ ./reiserfsprogs-ar-fix.patch ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libuuid ]; NIX_CFLAGS_COMPILE = "-std=gnu90"; diff --git a/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch b/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch new file mode 100644 index 000000000000..356782a3d984 --- /dev/null +++ b/pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch @@ -0,0 +1,10 @@ +--- reiserfsprogs-3.6.24/configure.ac.orig 2018-11-29 17:16:52.313624894 +0300 ++++ reiserfsprogs-3.6.24/configure.ac 2018-11-29 17:16:54.480669132 +0300 +@@ -21,6 +21,7 @@ + AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_RANLIB ++AM_PROG_AR + + dnl Checks for libraries. + |