diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-28 09:30:32 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-28 09:30:32 -0400 |
| commit | 335934a073d6024d54c71bf82d5f8baab13abe75 (patch) | |
| tree | 2bce649800d60fe58c11ed4e0f7d0169ed079277 /pkgs/os-specific/linux | |
| parent | 5e7b710a717055ebccff14db7f6db4efd38de8ba (diff) | |
| parent | 0402877344a80eae04073fa3d8ddb8906977d100 (diff) | |
| download | nixpkgs-335934a073d6024d54c71bf82d5f8baab13abe75.tar nixpkgs-335934a073d6024d54c71bf82d5f8baab13abe75.tar.gz nixpkgs-335934a073d6024d54c71bf82d5f8baab13abe75.tar.bz2 nixpkgs-335934a073d6024d54c71bf82d5f8baab13abe75.tar.lz nixpkgs-335934a073d6024d54c71bf82d5f8baab13abe75.tar.xz nixpkgs-335934a073d6024d54c71bf82d5f8baab13abe75.tar.zst nixpkgs-335934a073d6024d54c71bf82d5f8baab13abe75.zip | |
Merge branch 'systemd-arm' of git://github.com/abbradar/nixpkgs into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0bb9f509b38..d815203f845 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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" |