Merge branch 'systemd-arm' of git://github.com/abbradar/nixpkgs into staging

This commit is contained in:
Shea Levy 2018-03-28 09:30:32 -04:00
commit 335934a073
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27

View File

@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
"-Dsystem-gid-max=499"
# "-Dtime-epoch=1"
(if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
(if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
"-Defi-libdir=${toString gnu-efi}/lib"
"-Defi-includedir=${toString gnu-efi}/include/efi"
"-Defi-ldsdir=${toString gnu-efi}/lib"