From 50bca782b367b4cd0337a4dd751424b3d2fd4665 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Sep 2017 17:01:54 +0200 Subject: [PATCH] simple-scan: move to gnome3 package set --- .../gnome-3/core}/simple-scan/default.nix | 0 pkgs/desktops/gnome-3/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/{applications/graphics => desktops/gnome-3/core}/simple-scan/default.nix (100%) diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix similarity index 100% rename from pkgs/applications/graphics/simple-scan/default.nix rename to pkgs/desktops/gnome-3/core/simple-scan/default.nix 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 da57a8eda06..0beb4886159 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16245,7 +16245,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 { };