From ac1a531933a25cce11465bc8cd24f2a6c12a4915 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Sat, 16 Apr 2016 22:59:20 +0300 Subject: [PATCH] libcommuni: move to qmakeHook This reverts commit ee1af147f35818f60d3cd6192a4828abdbfdc632. --- pkgs/development/libraries/libcommuni/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 008311c620c9..7b83be7e911a 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb2d35866af7..007c8df4f07e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };