simple-scan: 3.28.1 → 3.30.2

1 files changed, 13 insertions, 29 deletions

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 3d7e78fa18df..415306273c7c 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,19 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
-  version = "3.28.1";
+  version = "3.30.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "140vz94vml0vf6kiw3sg436qfvajk21x6q86smvycgf24qfyvk6a";
+    sha256 = "0dknvdjlnxrp9nxd3yr8wyjc4kv94nwglss8pr6rfvl4hnlly53i";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "simple-scan"; };
-  };
-
-  buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
-                gtk libwebp packagekit sane-backends vala ];
+  buildInputs = [
+    cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
+    gtk libwebp packagekit sane-backends vala
+  ];
   nativeBuildInputs = [
     meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
     # For setup hook
@@ -25,30 +23,16 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs data/meson_compile_gschema.py
-
-    sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in
   '';
 
-  postInstall = ''
-    mkdir -p $out/share/icons
-    mv $out/share/simple-scan/icons/* $out/share/icons/
-    (
-    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;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "simple-scan";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Simple scanning utility";
     longDescription = ''
@@ -59,7 +43,7 @@ stdenv.mkDerivation rec {
       XSANE uses. This means that all existing scanners will work and the
       interface is well tested.
     '';
-    homepage = https://launchpad.net/simple-scan;
+    homepage = https://gitlab.gnome.org/GNOME/simple-scan;
     license = licenses.gpl3Plus;
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;