diff options
| author | Florian Klink <flokli@flokli.de> | 2020-10-28 00:33:26 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-10-28 23:24:17 +0100 |
| commit | 54c35f0940921ad43b49686f18e80634ff62d306 (patch) | |
| tree | 749365e38cd93c4c7a3350b5ec13b7d4d41d3420 /pkgs/os-specific/linux/systemd | |
| parent | 13a910e3f6e50ff3d1946e75cce6fde64656bba0 (diff) | |
| download | nixpkgs-54c35f0940921ad43b49686f18e80634ff62d306.tar nixpkgs-54c35f0940921ad43b49686f18e80634ff62d306.tar.gz nixpkgs-54c35f0940921ad43b49686f18e80634ff62d306.tar.bz2 nixpkgs-54c35f0940921ad43b49686f18e80634ff62d306.tar.lz nixpkgs-54c35f0940921ad43b49686f18e80634ff62d306.tar.xz nixpkgs-54c35f0940921ad43b49686f18e80634ff62d306.tar.zst nixpkgs-54c35f0940921ad43b49686f18e80634ff62d306.zip | |
systemd: withEfi: move gnu-efi check into assertion
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 09b828f5875..e4c07baeecc 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -86,6 +86,7 @@ assert withImportd -> (curl.dev != null && zlib != null && xz != null && libgcrypt != null && gnutar != null && gnupg != null && withCompression ); +assert withEfi -> (gnu-efi != null); assert withRemote -> lib.getDev curl != null; assert withCoredump -> withCompression; @@ -269,8 +270,8 @@ stdenv.mkDerivation { # more frequent development builds "-Dman=true" - "-Dgnu-efi=${lib.boolToString (withEfi && gnu-efi != null)}" - ] ++ lib.optionals (withEfi && gnu-efi != null) [ + "-Dgnu-efi=${lib.boolToString withEfi}" + ] ++ lib.optionals withEfi [ "-Defi-libdir=${toString gnu-efi}/lib" "-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-ldsdir=${toString gnu-efi}/lib" |