diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix similarity index 86% rename from pkgs/applications/graphics/simple-scan/default.nix rename to pkgs/desktops/gnome-3/core/simple-scan/default.nix index 0c800ce9859..0b453d5c533 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,14 +3,7 @@ , gnome3 }: stdenv.mkDerivation rec { - name = "simple-scan-${version}"; - version = "${major_version}.0.1"; - major_version = "3.22"; - - src = fetchurl { - url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz"; - sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5"; - }; + inherit (import ./src.nix fetchurl) name src; buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix new file mode 100644 index 00000000000..cea148891a7 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/simple-scan/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "simple-scan-3.22.0.1"; + + src = fetchurl { + url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz; + sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50"; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 7be1f79be4c..fcb36fb8ded 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -30,7 +30,7 @@ let optionalPackages = with gnome3; [ baobab eog epiphany evince gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-system-log gnome-system-monitor + gnome-system-log gnome-system-monitor simple-scan gnome_terminal gnome-user-docs evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs @@ -230,6 +230,8 @@ let rest = callPackage ./core/rest { }; + simple-scan = callPackage ./core/simple-scan { }; + sushi = callPackage ./core/sushi { }; totem = callPackage ./core/totem { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e106a014f..f232f8acfcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16328,7 +16328,7 @@ with pkgs; shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = callPackage ../applications/graphics/simple-scan { }; + simple-scan = gnome3.simple-scan; siproxd = callPackage ../applications/networking/siproxd { };