diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:27 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:27 +0200 |
| commit | 7f40cfd97b4df5bcb039c0efb0710abf47b849b8 (patch) | |
| tree | 4e50776f6c5bec1482844b1637e5fe9aa3c37d88 /pkgs/desktops/gnome-3/core | |
| parent | ade7faea7214fbb7d0879804e59b3fb9a61d6268 (diff) | |
| parent | 567f0a3df11b67572a52a05766fe258787bace9a (diff) | |
| download | nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.gz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.bz2 nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.lz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.xz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.zst nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/simple-scan/default.nix | 60 |
1 files changed, 48 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index d38339425ce7..1fefa7dd393d 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,24 +1,60 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3, gobject-introspection }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, itstool +, python3 +, wrapGAppsHook +, cairo +, gdk-pixbuf +, colord +, glib +, gtk3 +, gusb +, packagekit +, libwebp +, libxml2 +, sane-backends +, vala +, gnome3 +, gobject-introspection +}: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.2"; + version = "3.36.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; + sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs="; }; - buildInputs = [ - cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb - gtk3 libwebp packagekit sane-backends vala - ]; nativeBuildInputs = [ - meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 - # For setup hook - gobject-introspection + meson + ninja + gettext + itstool + pkgconfig + python3 + wrapGAppsHook + libxml2 + gobject-introspection # For setup hook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + colord + glib + gnome3.adwaita-icon-theme + gusb + gtk3 + libwebp + packagekit + sane-backends + vala ]; postPatch = '' |