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

systemd: cleanup cryptsetup input

Browse Source 
use lib.getDev to retrieve the dev output. Don't pass it to buildInputs
if we don't build with withCryptsetup set to true.
This commit is contained in:
Florian Klink 2020-10-27 23:52:28 +01:00
parent e1e01fa85e
commit 5f257d7d2c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,6 @@ stdenv.mkDerivation {
acl acl
audit audit
bzip2 bzip2
cryptsetup
glib glib
kmod kmod
libapparmor libapparmor
@ -191,7 +190,7 @@ stdenv.mkDerivation {
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withEfi gnu-efi ++ lib.optional withEfi gnu-efi
++ lib.optional withSelinux libselinux ++ lib.optional withSelinux libselinux
++ lib.optional withCryptsetup cryptsetup.dev ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
; ;
#dontAddPrefix = true; #dontAddPrefix = true;

1
pkgs/top-level/all-packages.nix
View File

@ -18671,7 +18671,6 @@ in
withEfi = false; withEfi = false;
withImportd = false; withImportd = false;
withCryptsetup = false; withCryptsetup = false;
cryptsetup = null;
glib = null; glib = null;
lvm2 = null; lvm2 = null;
}; };