public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Florian Klink 2020-08-06 12:01:45 +02:00
parent 2865490dc2
commit c81c10624c
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,22 +17,7 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
}: }:
let gnupg-minimal = gnupg.override { stdenv.mkDerivation {
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 {
version = "246"; version = "246";
pname = "systemd"; pname = "systemd";
@ -214,7 +199,7 @@ in stdenv.mkDerivation {
# absolute paths to gpg & tar # absolute paths to gpg & tar
substituteInPlace src/import/pull-common.c \ 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 for file in src/import/{{export,import,pull}-tar,import-common}.c; do
substituteInPlace $file \ substituteInPlace $file \
--replace '"tar"' '"${gnutar}/bin/tar"' --replace '"tar"' '"${gnutar}/bin/tar"'

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

@ -18066,8 +18066,25 @@ in
sysstat = callPackage ../os-specific/linux/sysstat { }; sysstat = callPackage ../os-specific/linux/sysstat { };
systemd = callPackage ../os-specific/linux/systemd { systemd = callPackage ../os-specific/linux/systemd {
utillinux = utillinuxMinimal; # break the cyclic dependency # break some cyclic dependencies
utillinux = utillinuxMinimal;
# provide a super minimal gnupg used for systemd-machined
gnupg = callPackage ../tools/security/gnupg/22.nix {
enableMinimal = true;
guiSupport = false;
pcsclite = null;
sqlite = null;
pinentry = null;
adns = null;
gnutls = null;
libusb1 = null;
openldap = null;
readline = null;
zlib = null;
bzip2 = null;
};
}; };
udev = systemd; # TODO: move to aliases.nix udev = systemd; # TODO: move to aliases.nix
systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; systemd-wait = callPackage ../os-specific/linux/systemd-wait { };