libsForQt5.herqq: fix build with qt5.15

Using a unreleased commit from upstream.

Also moved the derivation to mkLibsForQt5 to let
the application choose its Qt5 version.

Did not put an alias as previous version was broken
since ages.

2 files changed, 11 insertions, 8 deletions

diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 8dc0df3a9f2..265289f06f3 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
+{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
 
-stdenv.mkDerivation rec {
-  version = "2.1.0";
+mkDerivation rec {
+  version = "unstable-20-06-26";
   pname = "herqq";
 
   nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase unzip qtmultimedia ];
-  preConfigure = "cd herqq";
 
+  outputs = [ "out" "dev" ];
+
+  sourceRoot = "source/herqq";
   src = fetchFromGitHub {
     owner = "ThomArmax";
     repo = "HUPnP";
-    rev = version;
-    sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m";
+    rev = "c8385a8846b52def7058ae3794249d6b566a41fc";
+    sha256 = "FxN/QlLB3sZ6Vn/9VIKNUntX/B4+crQZ7t760pwFqY8=";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://herqq.org";
     description = "A software library for building UPnP devices and control points";
     platforms = platforms.linux;
     maintainers = [ ];
-    broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0af612780d2..2e03c6b6d5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15380,6 +15380,8 @@ in
 
     grantlee = callPackage ../development/libraries/grantlee/5 { };
 
+    herqq = callPackage ../development/libraries/herqq { };
+
     kdb = callPackage ../development/libraries/kdb { };
 
     kdiagram = callPackage ../development/libraries/kdiagram { };