nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 04:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: withEfi: move gnu-efi check into assertion

Browse Source
This commit is contained in:
Florian Klink 2020-10-28 00:33:26 +01:00
parent 13a910e3f6
commit 54c35f0940
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/systemd/default.nix
View File

@ -86,6 +86,7 @@ assert withImportd ->
(curl.dev != null && zlib != null && xz != null && libgcrypt != null (curl.dev != null && zlib != null && xz != null && libgcrypt != null
&& gnutar != null && gnupg != null && withCompression ); && gnutar != null && gnupg != null && withCompression );
assert withEfi -> (gnu-efi != null);
assert withRemote -> lib.getDev curl != null; assert withRemote -> lib.getDev curl != null;
assert withCoredump -> withCompression; assert withCoredump -> withCompression;
@ -269,8 +270,8 @@ stdenv.mkDerivation {
# more frequent development builds # more frequent development builds
"-Dman=true" "-Dman=true"
"-Dgnu-efi=${lib.boolToString (withEfi && gnu-efi != null)}" "-Dgnu-efi=${lib.boolToString withEfi}"
] ++ lib.optionals (withEfi && gnu-efi != null) [ ] ++ lib.optionals withEfi [
"-Defi-libdir=${toString gnu-efi}/lib" "-Defi-libdir=${toString gnu-efi}/lib"
"-Defi-includedir=${toString gnu-efi}/include/efi" "-Defi-includedir=${toString gnu-efi}/include/efi"
"-Defi-ldsdir=${toString gnu-efi}/lib" "-Defi-ldsdir=${toString gnu-efi}/lib"