public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30102 from jtojnar/gnome-simple-scan

Browse Source 
simple-scan: Move to GNOME package set
This commit is contained in:
Graham Christensen 2017-10-05 17:38:51 -04:00 committed by GitHub
commit 3bd24be7dc
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/graphics/simple-scan/default.nix → pkgs/desktops/gnome-3/core/simple-scan/default.nix
View File

@ -3,14 +3,7 @@
, gnome3 }: , gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simple-scan-${version}"; inherit (import ./src.nix fetchurl) name src;
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";
};
buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ];
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];

10
pkgs/desktops/gnome-3/core/simple-scan/src.nix Normal file
View File

@ -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";
};
}

4
pkgs/desktops/gnome-3/default.nix
View File

@ -30,7 +30,7 @@ let
optionalPackages = with gnome3; [ baobab eog epiphany evince optionalPackages = with gnome3; [ baobab eog epiphany evince
gucharmap nautilus totem vino yelp gnome-bluetooth gucharmap nautilus totem vino yelp gnome-bluetooth
gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot 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_terminal gnome-user-docs evolution file-roller gedit
gnome-clocks gnome-music gnome-tweak-tool gnome-photos gnome-clocks gnome-music gnome-tweak-tool gnome-photos
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
@ -230,6 +230,8 @@ let
rest = callPackage ./core/rest { }; rest = callPackage ./core/rest { };
simple-scan = callPackage ./core/simple-scan { };
sushi = callPackage ./core/sushi { }; sushi = callPackage ./core/sushi { };
totem = callPackage ./core/totem { }; totem = callPackage ./core/totem { };

2
pkgs/top-level/all-packages.nix
View File

@ -16328,7 +16328,7 @@ with pkgs;
shutter = callPackage ../applications/graphics/shutter { }; shutter = callPackage ../applications/graphics/shutter { };
simple-scan = callPackage ../applications/graphics/simple-scan { }; simple-scan = gnome3.simple-scan;
siproxd = callPackage ../applications/networking/siproxd { }; siproxd = callPackage ../applications/networking/siproxd { };