From 365e7e5d07f3b2962ab87ed28fcf74204577a712 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 22 Jul 2024 23:37:48 -0300 Subject: [PATCH] qmplay2: fetch submodules directly (get rid of fetchSubmodules) --- pkgs/by-name/qm/qmplay2/package.nix | 11 +++++++++++ pkgs/by-name/qm/qmplay2/sources.nix | 15 +++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix index 9c2697827421..f28084047c7c 100644 --- a/pkgs/by-name/qm/qmplay2/package.nix +++ b/pkgs/by-name/qm/qmplay2/package.nix @@ -29,6 +29,13 @@ in stdenv.mkDerivation (finalAttrs: { inherit (sources.qmplay2) pname version src; + postPatch = '' + pushd src + cp -va ${sources.qmvk.src}/* qmvk/ + chmod --recursive 744 qmvk + popd + ''; + nativeBuildInputs = [ cmake pkg-config @@ -66,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: { [ -e $out/bin/qmplay2 ] || ln -s $out/bin/QMPlay2 $out/bin/qmplay2 ''; + passthru = { + inherit sources; + }; + meta = { homepage = "https://github.com/zaps166/QMPlay2/"; description = "Qt-based Multimedia player"; diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix index e32b640a6e47..1cd64fae7f98 100644 --- a/pkgs/by-name/qm/qmplay2/sources.nix +++ b/pkgs/by-name/qm/qmplay2/sources.nix @@ -12,10 +12,21 @@ owner = "zaps166"; repo = "QMPlay2"; rev = self.version; - fetchSubmodules = true; - hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM="; + hash = "sha256-achnbloKJq4t7xwJ7Qn0bAEGjuLx8wiZK7+BOLYZaN0="; }; }; in self; + + qmvk = { + pname = "qmvk"; + version = "0-unstable-2024-03-30"; + + src = fetchFromGitHub { + owner = "zaps166"; + repo = "QmVk"; + rev = "50826653f34140afd03ccb7e8032715092b34446"; + hash = "sha256-p2yt0PE5j9+YGOj3T1y/z9N3djbXzxh7h27xHCMnAwo="; + }; + }; }