diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-03-27 20:41:01 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-03-27 20:42:25 +0100 |
commit | 6df88425c8242bbeb40099a95b1b25662c13aa52 (patch) | |
tree | 6c2c3c5374b7bcc53358adf5b67fe6ad4a311ce9 /nixos | |
parent | 8893c5886a8d1386c4b3ce064b13d04d79c84f9f (diff) | |
download | nixlib-6df88425c8242bbeb40099a95b1b25662c13aa52.tar nixlib-6df88425c8242bbeb40099a95b1b25662c13aa52.tar.gz nixlib-6df88425c8242bbeb40099a95b1b25662c13aa52.tar.bz2 nixlib-6df88425c8242bbeb40099a95b1b25662c13aa52.tar.lz nixlib-6df88425c8242bbeb40099a95b1b25662c13aa52.tar.xz nixlib-6df88425c8242bbeb40099a95b1b25662c13aa52.tar.zst nixlib-6df88425c8242bbeb40099a95b1b25662c13aa52.zip |
nixos/nix-ld: move default libraries to config
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2405.section.md | 3 | ||||
-rw-r--r-- | nixos/modules/programs/nix-ld.nix | 40 |
2 files changed, 23 insertions, 20 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index f4b1cc0609ad..a40640a7b8d0 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -139,6 +139,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. +- `programs.nix-ld.libraries` no longer sets `baseLibraries` via the option's default but in config and now merges any additional libraries with the default ones. + This means that `lib.mkForce` must be used to clear the list of default libraries. + - `pdns` was updated to version [v4.9.x](https://doc.powerdns.com/authoritative/changelog/4.9.html), which introduces breaking changes. Check out the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-9-0) for details. - `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information. diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index 6f36ce33640c..833fe96c7dd1 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -13,25 +13,6 @@ let extraPrefix = "/share/nix-ld"; ignoreCollisions = true; }; - - # We currently take all libraries from systemd and nix as the default. - # Is there a better list? - baseLibraries = with pkgs; [ - zlib - zstd - stdenv.cc.cc - curl - openssl - attr - libssh - bzip2 - libxml2 - acl - libsodium - util-linux - xz - systemd - ]; in { meta.maintainers = [ lib.maintainers.mic92 ]; @@ -41,7 +22,7 @@ in libraries = lib.mkOption { type = lib.types.listOf lib.types.package; description = lib.mdDoc "Libraries that automatically become available to all programs. The default set includes common libraries."; - default = baseLibraries; + default = [ ]; defaultText = lib.literalExpression "baseLibraries derived from systemd and nix dependencies."; }; }; @@ -57,5 +38,24 @@ in NIX_LD = "/run/current-system/sw/share/nix-ld/lib/ld.so"; NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib"; }; + + # We currently take all libraries from systemd and nix as the default. + # Is there a better list? + programs.nix-ld.libraries = with pkgs; [ + zlib + zstd + stdenv.cc.cc + curl + openssl + attr + libssh + bzip2 + libxml2 + acl + libsodium + util-linux + xz + systemd + ]; }; } |