diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-11 21:00:19 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-04-25 08:22:16 -0500 |
| commit | 558f7424f26076e1bb2260f13c04a9eb88127f97 (patch) | |
| tree | d4f586b634b19426aea01cfa3cb8ac6f804f3020 /pkgs/os-specific/linux/musl | |
| parent | 2d54f8f915166dbdc93ed9497f622799e930bf9b (diff) | |
| download | nixpkgs-558f7424f26076e1bb2260f13c04a9eb88127f97.tar nixpkgs-558f7424f26076e1bb2260f13c04a9eb88127f97.tar.gz nixpkgs-558f7424f26076e1bb2260f13c04a9eb88127f97.tar.bz2 nixpkgs-558f7424f26076e1bb2260f13c04a9eb88127f97.tar.lz nixpkgs-558f7424f26076e1bb2260f13c04a9eb88127f97.tar.xz nixpkgs-558f7424f26076e1bb2260f13c04a9eb88127f97.tar.zst nixpkgs-558f7424f26076e1bb2260f13c04a9eb88127f97.zip | |
musl: make libc -> {ldso,ldd} symlinks relative
Minor touchup while rebuilding things anyway.
Diffstat (limited to 'pkgs/os-specific/linux/musl')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index cd102cca00f..3d515f7b762 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { --replace -fno-asynchronous-unwind-tables "" ''; + patches = [ + # Minor touchup to build system making dynamic linker symlink relative + (fetchurl { + url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch; + sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; + }) + ]; preConfigure = '' configureFlagsArray+=("--syslibdir=$out/lib") ''; @@ -80,7 +87,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin # Create 'ldd' symlink, builtin - ln -s $out/lib/libc.so $out/bin/ldd + ln -rs $out/lib/libc.so $out/bin/ldd # (impure) cc wrapper around musl for interactive usuage for i in musl-gcc musl-clang ld.musl-clang; do |