Merge pull request #318369 from getchoo/pkgs/cartridges/refactor

cartridges: refactor; add missing build deps; ensure tls support
This commit is contained in:
Aleksana 2024-06-28 01:01:03 +08:00 committed by GitHub
commit 52542f7101
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 50 deletions

View File

@ -1,66 +1,61 @@
{ blueprint-compiler
, desktop-file-utils
, fetchFromGitHub
, gobject-introspection
, lib
, libadwaita
, meson
, ninja
, python3Packages
, stdenv
, wrapGAppsHook4
, nix-update-script
{
lib,
fetchFromGitHub,
python3Packages,
appstream,
blueprint-compiler,
desktop-file-utils,
gobject-introspection,
glib-networking,
libadwaita,
meson,
ninja,
pkg-config,
wrapGAppsHook4,
}:
stdenv.mkDerivation (finalAttrs: {
python3Packages.buildPythonApplication rec {
pname = "cartridges";
version = "2.8.5";
pyproject = false;
src = fetchFromGitHub {
owner = "kra-mo";
repo = "cartridges";
rev = "v${finalAttrs.version}";
rev = "v${version}";
hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4=";
};
pythonPath = with python3Packages; [
# TODO: remove this when #286814 hits master
mesonFlags = [ "-Dtiff_compression=jpeg" ];
nativeBuildInputs = [
appstream
blueprint-compiler
desktop-file-utils
gobject-introspection
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
glib-networking
libadwaita
];
dependencies = with python3Packages; [
pillow
pygobject3
pyyaml
requests
];
# TODO: remove this when #286814 hits master
mesonFlags = [ "-Dtiff_compression=jpeg" ];
buildInputs = [
libadwaita
(python3Packages.python.withPackages (_: finalAttrs.pythonPath))
];
nativeBuildInputs = [
blueprint-compiler
desktop-file-utils
gobject-introspection
meson
ninja
python3Packages.wrapPython
wrapGAppsHook4
];
dontWrapGApps = true;
makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ];
postFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
wrapPythonPrograms "$out/bin" "$out" "$pythonPath"
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "GTK4 + Libadwaita game launcher";
mainProgram = "cartridges";
longDescription = ''
A simple game launcher for all of your games.
It has support for importing games from Steam, Lutris, Heroic
@ -68,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
You can sort and hide games or download cover art from SteamGridDB.
'';
homepage = "https://apps.gnome.org/Cartridges/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.getchoo ];
platforms = platforms.linux;
changelog = "https://github.com/kra-mo/cartridges/releases/tag/${src.rev}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "cartridges";
platforms = lib.platforms.linux;
};
})
}

View File

@ -411,8 +411,6 @@ with pkgs;
caroline = callPackage ../development/libraries/caroline { };
cartridges = callPackage ../applications/misc/cartridges { };
castget = callPackage ../applications/networking/feedreaders/castget { };
catatonit = callPackage ../applications/virtualization/catatonit { };