From 5117c97a5a36a8e4d425551ffa082f2e037e8478 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:44:27 -0700 Subject: [PATCH 1/5] hqplayer-desktop: run pre/postInstall hooks --- pkgs/applications/audio/hqplayer-desktop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index af1818fe7188..85af26f57cf2 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -47,6 +47,8 @@ mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + # main executable mkdir -p $out/bin cp ./usr/bin/* $out/bin @@ -62,6 +64,8 @@ mkDerivation rec { # pixmaps mkdir -p $out/share/pixmaps cp ./usr/share/pixmaps/* $out/share/pixmaps + + runHook postInstall ''; postInstall = '' From 137f46dd4d67f913783c9dd90cee64dd2c12e55f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:44:43 -0700 Subject: [PATCH 2/5] hqplayer-desktop: 4.12.0-34 -> 4.12.1-35 --- pkgs/applications/audio/hqplayer-desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 85af26f57cf2..f054d5a811c4 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -17,11 +17,13 @@ mkDerivation rec { pname = "hqplayer-desktop"; - version = "4.12.0-34"; + version = "4.12.1-35"; src = fetchurl { + # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs + # c.f. https://github.com/NixOS/nixpkgs/pull/111616 url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-9kLKmi5lNtnRm9b4HnO01cO/C+Sg0DcKD64N5WBbYOE="; + sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8="; }; unpackPhase = '' From 9e4940589808bae536b42d1aaab0949fbea340e3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:44:58 -0700 Subject: [PATCH 3/5] hqplayer-desktop: remove broken changelog link --- pkgs/applications/audio/hqplayer-desktop/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index f054d5a811c4..18a75f3135aa 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -87,7 +87,6 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software HD-audio player"; - changelog = "https://www.signalyst.eu/bins/${pname}/fc33/hqplayer4desktop-${version}fc33.x86_64.changes"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; }; From a48ceda40ca498af4e44c9df8e0346f49f77c31f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:51:47 -0700 Subject: [PATCH 4/5] hqplayer-desktop: don't use single quotes around $out --- pkgs/applications/audio/hqplayer-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 18a75f3135aa..9e9a5ecf49ae 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -73,8 +73,8 @@ mkDerivation rec { postInstall = '' for desktopFile in $out/share/applications/*; do substituteInPlace "$desktopFile" \ - --replace '/usr/bin/' '$out/bin/' \ - --replace '/usr/share/doc/' '$out/share/doc/' + --replace /usr/bin/ $out/bin/ \ + --replace /usr/share/doc/ $out/share/doc/ done gunzip $out/share/doc/${pname}/*.gz From 3e80c137a3bc00e1e9e7801c1995ecf43d6fce2f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 16 Jun 2021 13:56:24 -0700 Subject: [PATCH 5/5] hqplayer-desktop: don't try to de-compress already de-compressed docs --- pkgs/applications/audio/hqplayer-desktop/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 9e9a5ecf49ae..2551c610c573 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -76,8 +76,6 @@ mkDerivation rec { --replace /usr/bin/ $out/bin/ \ --replace /usr/share/doc/ $out/share/doc/ done - - gunzip $out/share/doc/${pname}/*.gz ''; postFixup = ''