From 08af6b60c07fa99d0f58cdfe1252d39055648b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 24 Mar 2010 12:04:27 +0000 Subject: [PATCH] Trying to fix qt's openssl. The change I had done for qt-4.5 was not in qt-4.6. I just copied that to qt-4.6, expecting it to work. svn path=/nixpkgs/trunk/; revision=20806 --- pkgs/development/libraries/qt-4.6/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/qt-4.6/default.nix b/pkgs/development/libraries/qt-4.6/default.nix index 8f0746a59cc2..0a83cc9e4a55 100644 --- a/pkgs/development/libraries/qt-4.6/default.nix +++ b/pkgs/development/libraries/qt-4.6/default.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation { glib libtiff ]; + + # libQtNetwork will call libQtCore for it to dlopen openssl. + NIX_LDFLAGS = "-rpath ${openssl}/lib"; + # Don't shrink the rpath, to keep ${openssl} in it. + dontPatchELF = 1; prefixKey = "-prefix ";