summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-10-10 09:23:07 +0200
committerGitHub <noreply@github.com>2023-10-10 09:23:07 +0200
commit7cd09e80731865a639fa1af801ca770fbd26283a (patch)
tree0e57229ad619f580c6918d4152d5d8d49fdd0c1f
parent9fd82b38b40d9a9170fe376b3ded62a0fa7af548 (diff)
parent9ced81cfbd5cd2fbab74a7368a09bcc924ce6353 (diff)
downloadnixpkgs-7cd09e80731865a639fa1af801ca770fbd26283a.tar
nixpkgs-7cd09e80731865a639fa1af801ca770fbd26283a.tar.gz
nixpkgs-7cd09e80731865a639fa1af801ca770fbd26283a.tar.bz2
nixpkgs-7cd09e80731865a639fa1af801ca770fbd26283a.tar.lz
nixpkgs-7cd09e80731865a639fa1af801ca770fbd26283a.tar.xz
nixpkgs-7cd09e80731865a639fa1af801ca770fbd26283a.tar.zst
nixpkgs-7cd09e80731865a639fa1af801ca770fbd26283a.zip
Merge pull request #254334 from jiegec/glibc-libutil
glibc: use libutil.a when libutil.so.1 is unavailable
-rw-r--r--pkgs/development/libraries/glibc/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 1c822bf1ed0..e3fdfc6a293 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -145,7 +145,7 @@ in
       ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so
       ln -sf $out/lib/librt.so.1 $out/lib/librt.so
       ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so
-      ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so
+      test -f $out/lib/libutil.so.1 && ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so
       touch $out/lib/libpthread.a
 
       # Put libraries for static linking in a separate output.  Note
@@ -154,6 +154,8 @@ in
       mkdir -p $static/lib
       mv $out/lib/*.a $static/lib
       mv $static/lib/lib*_nonshared.a $out/lib
+      # If libutil.so.1 is missing, libutil.a is required.
+      test -f $out/lib/libutil.so.1 || mv $static/lib/libutil.a $out/lib
       # Some of *.a files are linker scripts where moving broke the paths.
       sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \
         -i "$static"/lib/*.a