diff options
author | Florian Klink <flokli@flokli.de> | 2020-08-06 12:01:45 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-08-13 20:51:39 +0200 |
commit | c81c10624c65927cd8008b71f878ce0b13829dab (patch) | |
tree | ee805e8158e39cd34be78ea466937b0686834363 /pkgs/os-specific/linux/systemd | |
parent | 2865490dc23d240fad0dc3eeb7102d10bd259e3c (diff) | |
download | nixpkgs-c81c10624c65927cd8008b71f878ce0b13829dab.tar nixpkgs-c81c10624c65927cd8008b71f878ce0b13829dab.tar.gz nixpkgs-c81c10624c65927cd8008b71f878ce0b13829dab.tar.bz2 nixpkgs-c81c10624c65927cd8008b71f878ce0b13829dab.tar.lz nixpkgs-c81c10624c65927cd8008b71f878ce0b13829dab.tar.xz nixpkgs-c81c10624c65927cd8008b71f878ce0b13829dab.tar.zst nixpkgs-c81c10624c65927cd8008b71f878ce0b13829dab.zip |
gnupgMinimal: move to all-packages.nix, use from inside systemd
This makes things more consistent with how we pass in utillinuxMinimal. There's already a minimal argument in the gnupg derivation, but this gnupg is even more minimal. Instead of defining a gnupgSuperMinimal, we define it inline inside systemd.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 161b74aea76..2609dc14bbc 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,22 +17,7 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -let gnupg-minimal = gnupg.override { - enableMinimal = true; - guiSupport = false; - pcsclite = null; - sqlite = null; - pinentry = null; - adns = null; - gnutls = null; - libusb1 = null; - openldap = null; - readline = null; - zlib = null; - bzip2 = null; -}; - -in stdenv.mkDerivation { +stdenv.mkDerivation { version = "246"; pname = "systemd"; @@ -214,7 +199,7 @@ in stdenv.mkDerivation { # absolute paths to gpg & tar substituteInPlace src/import/pull-common.c \ - --replace '"gpg"' '"${gnupg-minimal}/bin/gpg"' + --replace '"gpg"' '"${gnupg}/bin/gpg"' for file in src/import/{{export,import,pull}-tar,import-common}.c; do substituteInPlace $file \ --replace '"tar"' '"${gnutar}/bin/tar"' |