mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 04:35:41 +03:00
nixos/ldso: remove string context from linker soname
Unbreaks installer tests that otherwise start depending on i686-glibc
This commit is contained in:
parent
7e3d335152
commit
1950eec4aa
1 changed files with 2 additions and 2 deletions
|
@ -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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue