From 02dfdf731e801a6181ff4838d48c0da9ada02075 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 19 Jun 2024 12:50:40 -0300 Subject: [PATCH] qmplay2: detach sources acquisition to `sources.nix` Because it uses fetchSubmodules, and maybe in the future it will become discouraged. --- pkgs/by-name/qm/qmplay2/package.nix | 16 +++++----------- pkgs/by-name/qm/qmplay2/sources.nix | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/qm/qmplay2/sources.nix diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix index 5832ac7bf92e..9c2697827421 100644 --- a/pkgs/by-name/qm/qmplay2/package.nix +++ b/pkgs/by-name/qm/qmplay2/package.nix @@ -1,8 +1,8 @@ { lib, alsa-lib, + callPackage, cmake, - fetchFromGitHub, ffmpeg, fribidi, game-music-emu, @@ -23,17 +23,11 @@ vulkan-tools, }: +let + sources = callPackage ./sources.nix { }; +in stdenv.mkDerivation (finalAttrs: { - pname = "qmplay2"; - version = "24.04.07"; - - src = fetchFromGitHub { - owner = "zaps166"; - repo = "QMPlay2"; - rev = finalAttrs.version; - fetchSubmodules = true; - hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM="; - }; + inherit (sources.qmplay2) pname version src; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix new file mode 100644 index 000000000000..e32b640a6e47 --- /dev/null +++ b/pkgs/by-name/qm/qmplay2/sources.nix @@ -0,0 +1,21 @@ +{ + fetchFromGitHub, +}: + +{ + qmplay2 = let + self = { + pname = "qmplay2"; + version = "24.04.07"; + + src = fetchFromGitHub { + owner = "zaps166"; + repo = "QMPlay2"; + rev = self.version; + fetchSubmodules = true; + hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM="; + }; + }; + in + self; +}