From bfb87624b3d66198acb768700f812790eb3afe67 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 03:27:38 -0400 Subject: [PATCH 1/2] cartridges: use webp for tiff compression this is the default upstream and now works in nixpkgs after 67dea634b9ea2f82f29fad65abb7fb7f1c796b13 --- pkgs/by-name/ca/cartridges/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index eeb20dbfda77..0573d9a96588 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -25,9 +25,6 @@ python3Packages.buildPythonApplication rec { hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4="; }; - # TODO: remove this when #286814 hits master - mesonFlags = [ "-Dtiff_compression=jpeg" ]; - nativeBuildInputs = [ appstream blueprint-compiler From 7b1b48f8126493d6b8053f7336e0eb65eb8697ad Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 03:29:08 -0400 Subject: [PATCH 2/2] cartridges: wrap gnome search provider Fixes https://github.com/NixOS/nixpkgs/issues/322013 Previously this always failed to run as it was unwrapped. Oops! --- pkgs/by-name/ca/cartridges/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index 0573d9a96588..807f007e0bd8 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -51,6 +51,10 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ]; + postFixup = '' + wrapPythonProgramsIn $out/libexec $out $pythonPath + ''; + meta = { description = "GTK4 + Libadwaita game launcher"; longDescription = ''