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>
This commit is contained in:
aszlig 2016-04-15 04:13:25 +02:00
parent 7f4ab1cb72
commit ee1af147f3
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961

View file

@ -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;