nixpkgs

mirrors/nixpkgs

Fork 1

mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00

Commit graph

Author SHA1 Message Date

Author	SHA1	Message	Date
Nikolay Amiantov	ac1a531933	libcommuni: move to qmakeHook This reverts commit `ee1af147f3`.	2016-04-20 18:55:51 +03:00
aszlig	ee1af147f3	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>	2016-04-15 05:26:02 +02:00
Christoph Hrdinka	4ad12e038a	libcommuni: init at 2016-01-02	2016-01-10 13:31:31 +01:00

Nikolay Amiantov

ac1a531933

libcommuni: move to qmakeHook

This reverts commit ee1af147f3.

2016-04-20 18:55:51 +03:00

aszlig

ee1af147f3

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>

2016-04-15 05:26:02 +02:00

Christoph Hrdinka 4ad12e038a libcommuni: init at 2016-01-02 2016-01-10 13:31:31 +01:00

3 commits