summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-07-20 08:41:57 -0500
committerThomas Tuegel <ttuegel@gmail.com>2015-07-20 08:41:57 -0500
commit17a65c4bf043aaa35b6224a27a3d0a9df546ca85 (patch)
tree00540de041b4ac19869a85c0a1bee7139d5d94ed /pkgs/development/libraries
parent3f3da5ccbde10176a4e634888384bb48c024b337 (diff)
downloadnixlib-17a65c4bf043aaa35b6224a27a3d0a9df546ca85.tar
nixlib-17a65c4bf043aaa35b6224a27a3d0a9df546ca85.tar.gz
nixlib-17a65c4bf043aaa35b6224a27a3d0a9df546ca85.tar.bz2
nixlib-17a65c4bf043aaa35b6224a27a3d0a9df546ca85.tar.lz
nixlib-17a65c4bf043aaa35b6224a27a3d0a9df546ca85.tar.xz
nixlib-17a65c4bf043aaa35b6224a27a3d0a9df546ca85.tar.zst
nixlib-17a65c4bf043aaa35b6224a27a3d0a9df546ca85.zip
qt5.base: override postgresql autodetection
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/qt-5/5.4/qtbase.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index cf960c39b40b..441dbdd5c660 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -143,6 +143,11 @@ stdenv.mkDerivation {
     -${optionalString (buildTests == false) "no"}make tests
   '';
 
+  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+  # if dependency paths contain the string "pq", which can occur in the hash.
+  # To prevent these failures, we need to override PostgreSQL detection.
+  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
     fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre