diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-12-09 20:02:37 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-01-18 04:21:16 +0100 |
| commit | 5e227e6f1d047822972fa75c1b913aaa82e5de1f (patch) | |
| tree | 1ba2570929b3a7d26efa9346637e0c27f093b8dc /pkgs/os-specific/linux/mdadm | |
| parent | bcd31d0acba04aad033eea10477aa42446600014 (diff) | |
| download | nixpkgs-5e227e6f1d047822972fa75c1b913aaa82e5de1f.tar nixpkgs-5e227e6f1d047822972fa75c1b913aaa82e5de1f.tar.gz nixpkgs-5e227e6f1d047822972fa75c1b913aaa82e5de1f.tar.bz2 nixpkgs-5e227e6f1d047822972fa75c1b913aaa82e5de1f.tar.lz nixpkgs-5e227e6f1d047822972fa75c1b913aaa82e5de1f.tar.xz nixpkgs-5e227e6f1d047822972fa75c1b913aaa82e5de1f.tar.zst nixpkgs-5e227e6f1d047822972fa75c1b913aaa82e5de1f.zip | |
mdadm: Clean up package expression.
Let's use makeFlags directly instead of stitching together a makeFlagsArray in preBuild. This should make the expression much more readable and clean. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific/linux/mdadm')
| -rw-r--r-- | pkgs/os-specific/linux/mdadm/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 10b580edcea..e7ed190c0c5 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -19,22 +19,21 @@ stdenv.mkDerivation rec { patches = [ ./no-self-references.patch ]; + makeFlags = [ + "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" + "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" + ] ++ stdenv.lib.optionals (stdenv ? cross) [ + "CROSS_COMPILE=${stdenv.cross.config}-" + ]; + 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 @ @' -i Makefile"; - - # Force mdadm to use /var/run/mdadm.map for its map file (or - # /dev/.mdadm/map as a fallback). - preBuild = - '' - makeFlagsArray=(NIXOS=1 INSTALL=install INSTALL_BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm) - if [[ -n "$crossConfig" ]]; then - makeFlagsArray+=(CROSS_COMPILE=$crossConfig-) - fi - ''; + preConfigure = '' + sed -e 's@/lib/udev@''${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile + ''; meta = { description = "Programs for managing RAID arrays under Linux"; |