From e7cc2de7dda5ccb04e6d169158225072e4ff23b9 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Tue, 17 May 2016 00:49:28 -0400 Subject: [PATCH] simple-scan: improvements Fix missing icon. It was looking for a "scanner" device icon that can be only found as part of gnome3 default theme. Copied this device icon and renamed it as *the* simple-scan application icon. --- .../graphics/simple-scan/default.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 417d117d6886..40322a98e174 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }: +, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook +, gnome3 }: stdenv.mkDerivation rec { name = "simple-scan-${version}"; @@ -16,11 +17,30 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-packagekit" ]; + patchPhase = '' + sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in + ''; + preBuild = '' # Clean up stale .c files referencing packagekit headers as of 3.20.0: make clean ''; + postInstall = '' + ( + cd ${gnome3.defaultIconTheme}/share/icons/Adwaita + + for f in `find . | grep 'scanner\.'` + do + local outFile="`echo "$out/share/icons/hicolor/$f" | sed \ + -e 's#/devices/#/apps/#g' \ + -e 's#scanner\.#simple-scan\.#g'`" + mkdir -p "`realpath -m "$outFile/.."`" + cp "$f" "$outFile" + done + ) + ''; + enableParallelBuilding = true; doCheck = true;