movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/ldso: remove string context from linker soname

Browse source 
Unbreaks installer tests that otherwise start depending on i686-glibc
This commit is contained in:
K900 2023-12-15 12:39:26 +03:00
parent 7e3d335152
commit 1950eec4aa
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/config/ldso.nix
View file

@ -4,11 +4,11 @@ let
inherit (lib) last splitString mkOption types mdDoc optionals; inherit (lib) last splitString mkOption types mdDoc optionals;
libDir = pkgs.stdenv.hostPlatform.libDir; 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; pkgs32 = pkgs.pkgsi686Linux;
libDir32 = pkgs32.stdenv.hostPlatform.libDir; libDir32 = pkgs32.stdenv.hostPlatform.libDir;
ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker); ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker));
in { in {
options = { options = {
environment.ldso = mkOption { environment.ldso = mkOption {