JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcommuni: move to qmakeHook

Browse Source 
This reverts commit ee1af147f3.
This commit is contained in:
Nikolay Amiantov 2016-04-16 22:59:20 +03:00
parent 4b5bf1916a
commit ac1a531933
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libcommuni/default.nix
View File

@ -1,4 +1,4 @@
{ fetchgit, qt5, stdenv
{ fetchgit, qtbase, qmakeHook, stdenv
}:
stdenv.mkDerivation rec {
@ -11,16 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "15sb7vinaaz1v5nclxpnp5p9a0kmfmlgiqibkipnyydizclidpfx";
};
buildInputs = [ qt5.qtbase ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmakeHook ];
enableParallelBuild = true;
postPatch = ''
sed -i -e 's|/bin/pwd|pwd|g' -e 's/which/type -P/' configure
configurePhase = ''
sed -i -e 's|/bin/pwd|pwd|g' configure
./configure -config release -prefix $out -qmake $QMAKE
'';
configureFlags = [ "-config release" ];
meta = with stdenv.lib; {
description = "A cross-platform IRC framework written with Qt";
homepage = https://communi.github.io;

2
pkgs/top-level/all-packages.nix
View File

@ -7385,7 +7385,7 @@ in
libcm = callPackage ../development/libraries/libcm { };
libcommuni = callPackage ../development/libraries/libcommuni { };
libcommuni = qt5.callPackage ../development/libraries/libcommuni { };
libconfuse = callPackage ../development/libraries/libconfuse { };