diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-09-04 18:55:57 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-09-04 18:55:57 +0300 |
| commit | 19387e31233f1ac0bfd1084512c1d3f8493946b4 (patch) | |
| tree | ed995cc7267f4d86989020f595ce5004eb9728c7 /pkgs/os-specific/linux/mdadm | |
| parent | 967077537b42fffca3a81a3af3a228d1864fd61e (diff) | |
| download | nixpkgs-19387e31233f1ac0bfd1084512c1d3f8493946b4.tar nixpkgs-19387e31233f1ac0bfd1084512c1d3f8493946b4.tar.gz nixpkgs-19387e31233f1ac0bfd1084512c1d3f8493946b4.tar.bz2 nixpkgs-19387e31233f1ac0bfd1084512c1d3f8493946b4.tar.lz nixpkgs-19387e31233f1ac0bfd1084512c1d3f8493946b4.tar.xz nixpkgs-19387e31233f1ac0bfd1084512c1d3f8493946b4.tar.zst nixpkgs-19387e31233f1ac0bfd1084512c1d3f8493946b4.zip | |
mdadm4: Fix build by including change from 7d010ab5f4ae
And drop `-std=gnu89` while at it.
Diffstat (limited to 'pkgs/os-specific/linux/mdadm')
| -rw-r--r-- | pkgs/os-specific/linux/mdadm/4.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix index a83e7c852ee..5511d72884a 100644 --- a/pkgs/os-specific/linux/mdadm/4.nix +++ b/pkgs/os-specific/linux/mdadm/4.nix @@ -22,15 +22,13 @@ stdenv.mkDerivation rec { makeFlags = [ "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" + "STRIP=" ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.prefix}" ]; nativeBuildInputs = [ groff ]; - # Attempt removing if building with gcc5 when updating - NIX_CFLAGS_COMPILE = "-std=gnu89"; - preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ |