diff options
| author | K900 <me@0upti.me> | 2023-12-15 12:39:26 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-12-15 12:39:26 +0300 |
| commit | 1950eec4aa7bbae7097b7da5b72a04268b9a596b (patch) | |
| tree | 8549216763f9ab8a9497e752b3fc0362ddfed88e /nixos/modules | |
| parent | 7e3d3351522e0510917e52dd3657d663bf5efe71 (diff) | |
| download | nixlib-1950eec4aa7bbae7097b7da5b72a04268b9a596b.tar nixlib-1950eec4aa7bbae7097b7da5b72a04268b9a596b.tar.gz nixlib-1950eec4aa7bbae7097b7da5b72a04268b9a596b.tar.bz2 nixlib-1950eec4aa7bbae7097b7da5b72a04268b9a596b.tar.lz nixlib-1950eec4aa7bbae7097b7da5b72a04268b9a596b.tar.xz nixlib-1950eec4aa7bbae7097b7da5b72a04268b9a596b.tar.zst nixlib-1950eec4aa7bbae7097b7da5b72a04268b9a596b.zip | |
nixos/ldso: remove string context from linker soname
Unbreaks installer tests that otherwise start depending on i686-glibc
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/ldso.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/config/ldso.nix b/nixos/modules/config/ldso.nix index e5ae13a21145..72ae3958d886 100644 --- a/nixos/modules/config/ldso.nix +++ b/nixos/modules/config/ldso.nix @@ -4,11 +4,11 @@ let inherit (lib) last splitString mkOption types mdDoc optionals; libDir = pkgs.stdenv.hostPlatform.libDir; - ldsoBasename = last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker); + ldsoBasename = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker)); pkgs32 = pkgs.pkgsi686Linux; libDir32 = pkgs32.stdenv.hostPlatform.libDir; - ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker); + ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker)); in { options = { environment.ldso = mkOption { |