Author: viric
Date: Thu May 24 21:44:34 2012
New Revision: 34229
URL: https://nixos.org/websvn/nix/?rev=34229&sc=1

Log:
Fixing the paths of uclibc libpthread

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/uclibc/default.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/uclibc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/uclibc/default.nix     Thu May 24 
21:23:23 2012        (r34228)
+++ nixpkgs/trunk/pkgs/os-specific/linux/uclibc/default.nix     Thu May 24 
21:44:34 2012        (r34229)
@@ -84,7 +84,8 @@
     mkdir -p $out
     make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}
     (cd $out/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v 
"scsi$") .)
-    sed -i s@/lib/@$out/lib/@g $out/lib/libc.so
+    # libpthread.so may not exist, so I do || true
+    sed -i s@/lib/@$out/lib/@g $out/lib/libc.so $out/lib/libpthread.so || true
   '';
 
   passthru = {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to