summary refs log tree commit diff
path: root/pkgs/development/libraries/libcommuni
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-04-15 04:13:25 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-04-15 05:26:02 +0200
commitee1af147f35818f60d3cd6192a4828abdbfdc632 (patch)
treefb85d75a2a4e97ff4ee3b09bd6abbbce484f074c /pkgs/development/libraries/libcommuni
parent7f4ab1cb72cc4779b91384474b6b23e4744033d1 (diff)
downloadnixpkgs-ee1af147f35818f60d3cd6192a4828abdbfdc632.tar
nixpkgs-ee1af147f35818f60d3cd6192a4828abdbfdc632.tar.gz
nixpkgs-ee1af147f35818f60d3cd6192a4828abdbfdc632.tar.bz2
nixpkgs-ee1af147f35818f60d3cd6192a4828abdbfdc632.tar.lz
nixpkgs-ee1af147f35818f60d3cd6192a4828abdbfdc632.tar.xz
nixpkgs-ee1af147f35818f60d3cd6192a4828abdbfdc632.tar.zst
nixpkgs-ee1af147f35818f60d3cd6192a4828abdbfdc632.zip
libcommuni: Fix finding qmake
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path.

As the configurePhase is replaced by a qmake path directly from qtbase,
it won't work because the setup-hook from qtbase needs to do some setup
in order for qmake to find its own data files.

So instead of hardcoding that path, we just go for setting the
configureFlags attribute and replacing which with "type -P" so that the
configure script can figure out the right path to qmake on its own.

This fixes the build of libcommuni and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development/libraries/libcommuni')
-rw-r--r--pkgs/development/libraries/libcommuni/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index e8debfda1de..008311c620c 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -15,11 +15,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuild = true;
 
-  configurePhase = ''
-    sed -i -e 's|/bin/pwd|pwd|g' configure
-    ./configure -config release -prefix $out -qmake ${qt5.qtbase}/bin/qmake
+  postPatch = ''
+    sed -i -e 's|/bin/pwd|pwd|g' -e 's/which/type -P/' configure
   '';
 
+  configureFlags = [ "-config release" ];
+
   meta = with stdenv.lib; {
     description = "A cross-platform IRC framework written with Qt";
     homepage = https://communi.github.io;