diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
| commit | c5881ec2c91da7bcb4b0299f5842019c70cb90f5 (patch) | |
| tree | 9efaa7fe9f326a04e98760f5b3f10f6f463905ce /pkgs/tools/filesystems | |
| parent | e6834171b930f6db3796a16785d7cbb3173541b1 (diff) | |
| parent | 095544187a8ed13f14356f5df7dbe0ecc059ceb5 (diff) | |
| download | nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.gz nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.bz2 nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.lz nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.xz nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.zst nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/jfsutils/ar-fix.patch | 10 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/jfsutils/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/reiserfsprogs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch | 10 |
4 files changed, 31 insertions, 3 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; { diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index e23dd5f0bd1..345974bed58 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 00000000000..356782a3d98 --- /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. + |