From 25bb6455682f75b3b22c4bb2e7d9659fb7d60c7a Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 25 Oct 2021 11:09:31 -0700
Subject: [PATCH 1/2] hqplayerd: 4.26.0-67 -> 4.26.2-69

---
 pkgs/servers/hqplayerd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix
index 3bda53ad1404..035d7b4e32dc 100644
--- a/pkgs/servers/hqplayerd/default.nix
+++ b/pkgs/servers/hqplayerd/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hqplayerd";
-  version = "4.26.0-67";
+  version = "4.26.2-69";
 
   src = fetchurl {
     url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm";
-    sha256 = "sha256-Wbtt1yO/CE2cewOE5RynwEm+fCdOV1cxzR/XiCwj0NU=";
+    sha256 = "sha256-zxUVtOi4fN3EuCbzH/SEse24Qz7/0jozzDX1yW8bhCU=";
   };
 
   unpackPhase = ''

From 042b62583e08b05ed8e7ee0b3530ae16b495286b Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Mon, 25 Oct 2021 11:31:18 -0700
Subject: [PATCH 2/2] hqplayerd: fix gupnp version mismatches with fc34

---
 pkgs/servers/hqplayerd/default.nix | 33 +++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix
index 035d7b4e32dc..a461608badf0 100644
--- a/pkgs/servers/hqplayerd/default.nix
+++ b/pkgs/servers/hqplayerd/default.nix
@@ -8,14 +8,40 @@
 , gcc11
 , gnome
 , gssdp
-, gupnp
 , lib
 , libgmpris
 , llvmPackages_10
 , rpmextract
 , wavpack
-}:
 
+, gupnp
+, gupnp-av
+, meson
+, ninja
+}:
+let
+  # hqplayerd relies on some package versions available for the fc34 release,
+  # which has out-of-date pkgs compared to nixpkgs. The following drvs
+  # can/should be removed when the fc35 hqplayer rpm is made available.
+  gupnp_1_2 = gupnp.overrideAttrs (old: rec {
+    pname = "gupnp";
+    version = "1.2.7";
+    src = fetchurl {
+      url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+      sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w=";
+    };
+  });
+
+  gupnp-av_0_12 = gupnp-av.overrideAttrs (old: rec {
+    pname = "gupnp-av";
+    version = "0.12.11";
+    src = fetchurl {
+      url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+      sha256 = "sha256-aJ3PFJKriZHa6ikTZaMlSKd9GiKU2FszYitVzKnOb9w=";
+    };
+    nativeBuildInputs = lib.subtractLists [ meson ninja ] old.nativeBuildInputs;
+  });
+in
 stdenv.mkDerivation rec {
   pname = "hqplayerd";
   version = "4.26.2-69";
@@ -38,7 +64,8 @@ stdenv.mkDerivation rec {
     gcc11.cc.lib
     gnome.rygel
     gssdp
-    gupnp
+    gupnp_1_2
+    gupnp-av_0_12
     libgmpris
     llvmPackages_10.openmp
     wavpack