diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-27 20:00:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-27 20:00:18 +0100 |
| commit | 5d03fe6ac4b2e5e4132bb6f893380544ae2cf008 (patch) | |
| tree | 8054ca15d0adec3e73cf7fc99ee79c3f16302fb2 | |
| parent | 5dc3838d057151b90b1a95afaf4595e8db6adc07 (diff) | |
| parent | 5f8a741abfde56cd94fc9171d1a485131050828a (diff) | |
| download | nixpkgs-5d03fe6ac4b2e5e4132bb6f893380544ae2cf008.tar nixpkgs-5d03fe6ac4b2e5e4132bb6f893380544ae2cf008.tar.gz nixpkgs-5d03fe6ac4b2e5e4132bb6f893380544ae2cf008.tar.bz2 nixpkgs-5d03fe6ac4b2e5e4132bb6f893380544ae2cf008.tar.lz nixpkgs-5d03fe6ac4b2e5e4132bb6f893380544ae2cf008.tar.xz nixpkgs-5d03fe6ac4b2e5e4132bb6f893380544ae2cf008.tar.zst nixpkgs-5d03fe6ac4b2e5e4132bb6f893380544ae2cf008.zip | |
Merge pull request #101792 from flokli/systemdminimal-without-glib
systemdMinimal: build without glib
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3621414af9a..ffb6da3c057 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 c801d335ab9..1838908b1dd 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; }; |