diff options
author | Florian Klink <flokli@flokli.de> | 2020-10-27 23:52:28 +0100 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-10-28 23:24:17 +0100 |
commit | 5f257d7d2cd66cd5bcf832245e6d2734e2798381 (patch) | |
tree | 503c7199e580407185d27bd0bde192330c39b4a7 | |
parent | e1e01fa85e1a8cd5e4b6a0fa0cdaf51115d6eb49 (diff) | |
download | nixpkgs-5f257d7d2cd66cd5bcf832245e6d2734e2798381.tar nixpkgs-5f257d7d2cd66cd5bcf832245e6d2734e2798381.tar.gz nixpkgs-5f257d7d2cd66cd5bcf832245e6d2734e2798381.tar.bz2 nixpkgs-5f257d7d2cd66cd5bcf832245e6d2734e2798381.tar.lz nixpkgs-5f257d7d2cd66cd5bcf832245e6d2734e2798381.tar.xz nixpkgs-5f257d7d2cd66cd5bcf832245e6d2734e2798381.tar.zst nixpkgs-5f257d7d2cd66cd5bcf832245e6d2734e2798381.zip |
systemd: cleanup cryptsetup input
use lib.getDev to retrieve the dev output. Don't pass it to buildInputs if we don't build with withCryptsetup set to true.
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4a501e8872b..4b64c8d523e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -169,7 +169,6 @@ stdenv.mkDerivation { acl audit bzip2 - cryptsetup glib kmod libapparmor @@ -191,7 +190,7 @@ stdenv.mkDerivation { ++ lib.optional withLibseccomp libseccomp ++ lib.optional withEfi gnu-efi ++ lib.optional withSelinux libselinux - ++ lib.optional withCryptsetup cryptsetup.dev + ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ; #dontAddPrefix = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd5facef827..456b43a9c1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18671,7 +18671,6 @@ in withEfi = false; withImportd = false; withCryptsetup = false; - cryptsetup = null; glib = null; lvm2 = null; }; |