From 5f8a741abfde56cd94fc9171d1a485131050828a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 26 Oct 2020 21:57:01 +0100 Subject: [PATCH] systemdMinimal: build without glib This takes glib (and by this, gtk-doc) out of systemdMinimal's build closure. --- pkgs/os-specific/linux/systemd/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index da99280f63b8..f1da382bfa56 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -143,6 +143,7 @@ in stdenv.mkDerivation { "-Dsetfont-path=${kbd}/bin/setfont" "-Dtty-gid=3" # tty in NixOS has gid 3 "-Ddebug-shell=${bashInteractive}/bin/bash" + "-Dglib=${stdenv.lib.boolToString (glib != null)}" # while we do not run tests we should also not build them. Removes about 600 targets "-Dtests=false" "-Dimportd=${stdenv.lib.boolToString withImportd}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c801d335ab90..1838908b1dd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18660,6 +18660,7 @@ in withImportd = false; withCryptsetup = false; cryptsetup = null; + glib = null; lvm2 = null; };