From 1950eec4aa7bbae7097b7da5b72a04268b9a596b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Dec 2023 12:39:26 +0300 Subject: [PATCH] nixos/ldso: remove string context from linker soname Unbreaks installer tests that otherwise start depending on i686-glibc --- nixos/modules/config/ldso.nix | 4 ++-- 1 file 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 {