diff options
| author | eburimu <urusan80@gmail.com> | 2018-11-28 00:16:59 +0300 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-11-29 10:14:02 +0000 |
| commit | 98a2a5b5370c1e2092d09cb38b9dcff6d98a109f (patch) | |
| tree | fcdf442065e6e4605ad55e13df058ebb75185d4c /pkgs/tools/filesystems/jfsutils | |
| parent | 5df783f1066181d5692fdcb70c7b26bfbd2ec47b (diff) | |
| download | nixpkgs-98a2a5b5370c1e2092d09cb38b9dcff6d98a109f.tar nixpkgs-98a2a5b5370c1e2092d09cb38b9dcff6d98a109f.tar.gz nixpkgs-98a2a5b5370c1e2092d09cb38b9dcff6d98a109f.tar.bz2 nixpkgs-98a2a5b5370c1e2092d09cb38b9dcff6d98a109f.tar.lz nixpkgs-98a2a5b5370c1e2092d09cb38b9dcff6d98a109f.tar.xz nixpkgs-98a2a5b5370c1e2092d09cb38b9dcff6d98a109f.tar.zst nixpkgs-98a2a5b5370c1e2092d09cb38b9dcff6d98a109f.zip | |
fix jfsutils cross compilation
Diffstat (limited to 'pkgs/tools/filesystems/jfsutils')
| -rw-r--r-- | pkgs/tools/filesystems/jfsutils/ar-fix.patch | 10 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/jfsutils/default.nix | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/jfsutils/ar-fix.patch b/pkgs/tools/filesystems/jfsutils/ar-fix.patch new file mode 100644 index 00000000000..697029cd5a8 --- /dev/null +++ b/pkgs/tools/filesystems/jfsutils/ar-fix.patch @@ -0,0 +1,10 @@ +--- jfsutils-1.1.15/configure.in.orig 2018-11-27 20:46:55.830242385 +0300 ++++ jfsutils-1.1.15/configure.in 2018-11-27 20:47:00.596307630 +0300 +@@ -15,6 +15,7 @@ + AC_PATH_PROG(LN, ln, ln) + AC_PROG_LN_S + AC_PROG_RANLIB ++AM_PROG_AR + + dnl Checks for header files. + AC_HEADER_STDC diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index acc7a91d93f..92dfe00c951 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libuuid }: +{ stdenv, fetchurl, libuuid, autoreconfHook }: stdenv.mkDerivation rec { name = "jfsutils-1.1.15"; @@ -8,8 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4"; }; - patches = [ ./types.patch ./hardening-format.patch ]; + patches = [ + ./types.patch + ./hardening-format.patch + # required for cross-compilation + ./ar-fix.patch + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libuuid ]; meta = with stdenv.lib; { |