about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authormaxine <35892750+amaxine@users.noreply.github.com>2024-01-12 22:14:57 +0100
committerGitHub <noreply@github.com>2024-01-12 22:14:57 +0100
commit826bb5e45d70e8aabbbc82e40ee9f87bc95edb48 (patch)
tree00fa9cb0797f0a5c4da20e0c12aea136d8ed02d3 /pkgs/applications/misc
parente8ab82a53c918fb265d7bf219166216c9c81e204 (diff)
parent280b6d8d65f4d5aaaa82c0c23925a309118fff57 (diff)
Merge pull request #273987 from r-ryantm/auto-update/cartridges
cartridges: 2.3 -> 2.7.2
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/cartridges/default.nix33
1 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix
index d03b382f1c2b9..c0ed598b653ad 100644
--- a/pkgs/applications/misc/cartridges/default.nix
+++ b/pkgs/applications/misc/cartridges/default.nix
@@ -6,29 +6,32 @@
 , libadwaita
 , meson
 , ninja
-, python3
+, python3Packages
 , stdenv
 , wrapGAppsHook4
+, nix-update-script
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cartridges";
-  version = "2.3";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "kra-mo";
     repo = "cartridges";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-d0c0043kssPvGxs6FygDkTKZoYtFge2cH4MIhz2vVYk=";
+    hash = "sha256-+18TWtxKT87CZ8vTtYac9aQ0wIbhJEXbXFZrSj5BmjI=";
   };
 
+  pythonPath = with python3Packages; [
+    pillow
+    pygobject3
+    pyyaml
+    requests
+  ];
+
   buildInputs = [
     libadwaita
-    (python3.withPackages (p: with p; [
-      pillow
-      pygobject3
-      pyyaml
-      requests
-    ]))
+    (python3Packages.python.withPackages (_: finalAttrs.pythonPath))
   ];
 
   nativeBuildInputs = [
@@ -37,9 +40,21 @@ stdenv.mkDerivation (finalAttrs: {
     gobject-introspection
     meson
     ninja
+    python3Packages.wrapPython
     wrapGAppsHook4
   ];
 
+  dontWrapGApps = true;
+
+  postFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    wrapPythonPrograms "$out/bin" "$out" "$pythonPath"
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "A GTK4 + Libadwaita game launcher";
     longDescription = ''