public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mdadm: Don't use stdenv.cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:39:12 -04:00 committed by John Ericson
parent a210b08d18
commit 5d83d36389
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/mdadm/4.nix
View File

@ -1,4 +1,7 @@
{ stdenv, fetchurl, groff }: { stdenv
, fetchurl, groff
, buildPlatform, hostPlatform
}:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -19,8 +22,8 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
"MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
] ++ stdenv.lib.optionals (stdenv ? cross) [ ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
"CROSS_COMPILE=${stdenv.cross.config}-" "CROSS_COMPILE=${stdenv.cc.prefix}"
]; ];
nativeBuildInputs = [ groff ]; nativeBuildInputs = [ groff ];

9
pkgs/os-specific/linux/mdadm/default.nix
View File

@ -1,4 +1,7 @@
{ stdenv, fetchurl, groff }: { stdenv
, fetchurl, groff
, buildPlatform, hostPlatform
}:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -19,8 +22,8 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
"MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
] ++ stdenv.lib.optionals (stdenv ? cross) [ ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
"CROSS_COMPILE=${stdenv.cross.config}-" "CROSS_COMPILE=${stdenv.cc.prefix}"
]; ];
nativeBuildInputs = [ groff ]; nativeBuildInputs = [ groff ];