From 17107cf4da04881c48a389ca6ae262379443b536 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 16 Feb 2025 08:34:39 +0800 Subject: [PATCH] simple-scan: Backport fix for RDNN app ID Otherwise GResourced icons are not used. Fixes: f61ee035c46008e0ddbae7bcb08ed9bddc330108 --- pkgs/by-name/si/simple-scan/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 03059cf0ab0f..7136a31ac404 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk="; }; + patches = [ + # simple-scan: Use RDNN app ID + # https://gitlab.gnome.org/GNOME/simple-scan/-/issues/390 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/simple-scan/-/commit/c09a6def153e52494072a36233c7e7b3307b67bf.patch"; + hash = "sha256-deyssrsVwPAfT5ru6c0LFwR2pEFnZ0v8wMqoi96tw8s="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -64,11 +74,6 @@ stdenv.mkDerivation rec { patchShebangs data/meson_compile_gschema.py ''; - postInstall = '' - mkdir -p $out/share/icons/hicolor/scalable/actions/ - install -m 444 ../data/icons/scalable/actions/* $out/share/icons/hicolor/scalable/actions/ - ''; - doCheck = true; passthru = {