From 5f257d7d2cd66cd5bcf832245e6d2734e2798381 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 27 Oct 2020 23:52:28 +0100
Subject: 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.
---
 pkgs/os-specific/linux/systemd/default.nix | 3 +--
 pkgs/top-level/all-packages.nix            | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'pkgs')

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;
   };
-- 
cgit 1.4.1