From b6177842aeaf13df5d6f0912f05503bf0d98b03a Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 20 Aug 2024 16:23:00 +0800 Subject: [PATCH 1/2] qcm: 1.0.3 -> 1.0.4 --- pkgs/by-name/qc/qcm/package.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix index c1aaa0e3311e..67506fb5279f 100644 --- a/pkgs/by-name/qc/qcm/package.nix +++ b/pkgs/by-name/qc/qcm/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "qcm"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hypengw"; repo = "Qcm"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-9xbAw5U4BtpupelsOzfZGosdLx06TKPTG8hhc/no3R0="; + hash = "sha256-dwzstlmGuY8oRxxO2BPXmSCSnE7Fbp+dyYVs17HUopA="; }; patches = [ ./remove_cubeb_vendor.patch ]; @@ -42,16 +42,12 @@ stdenv.mkDerivation rec { "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}" ]; - postInstall = '' - rm -r $out/{include,lib/cmake} - ''; - - meta = with lib; { + meta = { description = "Unofficial Qt client for netease cloud music"; homepage = "https://github.com/hypengw/Qcm"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; mainProgram = "Qcm"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; }; } From 81d242975c30bf87b0a56c617da25a816830a98e Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 22 Aug 2024 20:07:31 +0800 Subject: [PATCH 2/2] qcm: switch to finalAttrs --- pkgs/by-name/qc/qcm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix index 67506fb5279f..88ecd5770402 100644 --- a/pkgs/by-name/qc/qcm/package.nix +++ b/pkgs/by-name/qc/qcm/package.nix @@ -9,14 +9,14 @@ , cubeb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qcm"; version = "1.0.4"; src = fetchFromGitHub { owner = "hypengw"; repo = "Qcm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-dwzstlmGuY8oRxxO2BPXmSCSnE7Fbp+dyYVs17HUopA="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; -} +})