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

util-linux: No more crossAttrs

Browse Source 
More cleanup will come later
This commit is contained in:
John Ericson 2018-07-23 17:03:39 -04:00
parent 1833a04aed
commit 519e87a449
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow { lib, stdenv, fetchurl, pkgconfig, zlib, shadow
, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }:
let let
version = lib.concatStringsSep "." ([ majorVersion ] version = lib.concatStringsSep "." ([ majorVersion ]
@ -28,12 +28,6 @@ in stdenv.mkDerivation rec {
--replace "/bin/umount" "$out/bin/umount" --replace "/bin/umount" "$out/bin/umount"
''; '';
crossAttrs = {
# Work around use of `AC_RUN_IFELSE'.
preConfigure = "export scanf_cv_type_modifier=ms" + lib.optionalString (systemd != null)
"\nconfigureFlags+=\" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/\"";
};
preConfigure = lib.optionalString (systemd != null) '' preConfigure = lib.optionalString (systemd != null) ''
configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/" configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
''; '';
@ -49,8 +43,10 @@ in stdenv.mkDerivation rec {
"--disable-use-tty-group" "--disable-use-tty-group"
"--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin" "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin"
"--disable-makeinstall-setuid" "--disable-makeinstall-chown" "--disable-makeinstall-setuid" "--disable-makeinstall-chown"
] ] ++ lib.optional (ncurses == null) "--without-ncurses"
++ lib.optional (ncurses == null) "--without-ncurses"; ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"scanf_cv_type_modifier=ms"
;
makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin"; makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";