diff options
| author | Nick Spinale <nick@nickspinale.com> | 2019-01-09 16:45:29 +0000 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2019-09-15 15:36:31 +0200 |
| commit | 5856dc86ac92233e454b026f2d967c5697f45af4 (patch) | |
| tree | f07e8755f73e16f7a70850fe9295baff7983ccfa | |
| parent | 80e2c41b877199301daaddd9583b694f157dfb79 (diff) | |
| download | nixpkgs-5856dc86ac92233e454b026f2d967c5697f45af4.tar nixpkgs-5856dc86ac92233e454b026f2d967c5697f45af4.tar.gz nixpkgs-5856dc86ac92233e454b026f2d967c5697f45af4.tar.bz2 nixpkgs-5856dc86ac92233e454b026f2d967c5697f45af4.tar.lz nixpkgs-5856dc86ac92233e454b026f2d967c5697f45af4.tar.xz nixpkgs-5856dc86ac92233e454b026f2d967c5697f45af4.tar.zst nixpkgs-5856dc86ac92233e454b026f2d967c5697f45af4.zip | |
bridge-utils: fix cross-compilation
| -rw-r--r-- | pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch | 25 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/bridge-utils/default.nix | 7 |
2 files changed, 29 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch new file mode 100644 index 00000000000..efa41075644 --- /dev/null +++ b/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch @@ -0,0 +1,25 @@ +diff --git a/configure.in b/configure.in +index 5e3f89b..19be6d9 100644 +--- a/configure.in ++++ b/configure.in +@@ -9,6 +9,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_TOOL([AR], [ar]) + + dnl Checks for header files. + AC_HEADER_STDC +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 20512c4..83c802b 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -1,7 +1,7 @@ + + KERNEL_HEADERS=-I@KERNEL_HEADERS@ + +-AR=ar ++AR=@AR@ + RANLIB=@RANLIB@ + + CC=@CC@ diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 2725a5909b7..e3207fdf37d 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; }; - # Remove patch once the kernel headers are updated - patches = [ ./add-ip6-header.patch ]; + patches = [ + ./autoconf-ar.patch + ./add-ip6-header.patch # Remove patch once the kernel headers are updated + ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; postInstall = '' # The bridge utils build does not fail even if the brctl binary |