Author: eelco
Date: Fri Aug 12 16:45:17 2011
New Revision: 28519
URL: https://svn.nixos.org/websvn/nix/?rev=28519&sc=1
Log:
* Fix SSL support in Chrome. It dynamically tries to open
libnssckbi.so (which contains the root certificates), so that
library has to be in LD_LIBRARY_PATH.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
Fri Aug 12 14:27:28 2011 (r28518)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/chromium/default.nix
Fri Aug 12 16:45:17 2011 (r28519)
@@ -24,7 +24,7 @@
phases = "unpackPhase installPhase";
- buildInputs = [makeWrapper unzip];
+ buildInputs = [ makeWrapper unzip ];
libPath =
stdenv.lib.makeLibraryPath
@@ -38,20 +38,17 @@
installPhase = ''
ensureDir $out/bin
- ensureDir $out/chrome
- ensureDir $out/lib
+ ensureDir $out/libexec/chrome
- cp -R * $out/chrome
- ln -s $out/chrome/chrome $out/bin/chrome
- ${patchelf}/bin/patchelf --interpreter "$(cat
$NIX_GCC/nix-support/dynamic-linker)" --set-rpath
${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib
$out/chrome/chrome
-
- ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
- ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
- ln -s ${nss}/lib/libssl3.so $out/lib/libssl3.so.1d
- ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
- ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
- ln -s ${nspr}/lib/libplds4.so $out/lib/libplds4.so.0d
- ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
+ cp -R * $out/libexec/chrome
+
+ ${patchelf}/bin/patchelf \
+ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath
${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \
+ $out/libexec/chrome/chrome
+
+ makeWrapper $out/libexec/chrome/chrome $out/bin/chrome \
+ --prefix LD_LIBRARY_PATH : "${nss}/lib"
'';
meta = with stdenv.lib; {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
