solarus-launcher: un-vendor qlementine within nixpkgs; refactor

This commit is contained in:
Jasi
2025-08-04 16:23:19 -04:00
parent 29dcdca5c3
commit aa70f7ce14
+11 -36
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitLab,
fetchFromGitHub,
replaceVars,
cmake,
ninja,
@@ -16,38 +15,12 @@
libvorbis,
solarus,
glm,
qt6Packages,
kdePackages,
qt6,
qlementine,
qlementine-icons,
qtappinstancemanager,
}:
let
qlementine-icons-src = fetchFromGitHub {
owner = "oclero";
repo = "qlementine-icons";
tag = "v1.8.0";
hash = "sha256-FPndzMEOQvYNYUbT2V6iDlwoYqOww38GW/T3zUID3g0=";
};
qlementine-src = fetchFromGitHub {
owner = "oclero";
repo = "qlementine";
tag = "v1.2.1";
hash = "sha256-CPQMmTXyUW+CyLjHYx+IdXY4I2mVPudOmAksjd+izPA=";
};
qtappinstancemanager-src = fetchFromGitHub {
owner = "oclero";
repo = "qtappinstancemanager";
tag = "v1.3.0";
hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
};
inherit (qt6Packages)
qtbase
qttools
wrapQtAppsHook
;
in
stdenv.mkDerivation (finalAttrs: {
pname = "solarus-launcher";
version = "2.0.0";
@@ -61,7 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
(replaceVars ./github-fetches.patch {
inherit qlementine-src qlementine-icons-src qtappinstancemanager-src;
qlementine-src = qlementine.src;
qlementine-icons-src = qlementine-icons.src;
qtappinstancemanager-src = qtappinstancemanager.src;
})
];
@@ -69,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
ninja
qttools
wrapQtAppsHook
qt6.qttools
qt6.wrapQtAppsHook
];
buildInputs = [
@@ -83,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
libmodplug
libvorbis
solarus
qtbase
kdePackages.qtsvg
qt6.qtbase
qt6.qtsvg
glm
];