gnome3.20: add gnome-packagekit, gnome-software

Previously the two were just in gnome-3.18. This adds them as
optionalPackages in gnome3.20.
This commit is contained in:
Matthew Bauer 2016-06-16 19:19:49 +00:00
parent 10fb846989
commit e7cd45b6e6
5 changed files with 75 additions and 4 deletions

View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
, json_glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
gtkspell3 json_glib
polkit attr acl libyaml ];
propogatedBuildInputs = [ isocodes ];
postInstall = ''
mkdir -p $out/share/xml/
ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes
'';
meta = with stdenv.lib; {
homepage = https://www.freedesktop.org/software/PackageKit/;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
license = licenses.gpl2;
description = "GNOME Software lets you install and update applications and system extensions.";
};
}

View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-software-3.20.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.0.tar.xz;
sha256 = "0w0bp29fm13a235gq8vylihzjfxx20ri46w4w2syaw0cixxihbix";
};
}

View File

@ -3,7 +3,7 @@
let
pkgsFun = overrides:
let
let
self = self_ // overrides;
self_ = with self; {
@ -35,7 +35,7 @@ let
gnome-clocks gnome-music gnome-tweak-tool gnome-photos
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
gnome-getting-started-docs
gnome-getting-started-docs gnome-packagekit gnome-software
];
gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@ -149,6 +149,8 @@ let
gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
gnome-software = callPackage ./core/gnome-software { };
gnome-system-log = callPackage ./core/gnome-system-log { };
gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
@ -359,13 +361,13 @@ let
california = callPackage ./misc/california { };
geary = callPackage ./misc/geary {
geary = callPackage ./misc/geary {
webkitgtk = webkitgtk24x;
};
gfbgraph = callPackage ./misc/gfbgraph { };
gitg = callPackage ./misc/gitg {
gitg = callPackage ./misc/gitg {
webkitgtk = webkitgtk24x;
};
@ -391,6 +393,8 @@ let
gnome-video-effects = callPackage ./misc/gnome-video-effects { };
gnome-packagekit = callPackage ./misc/gnome-packagekit { };
};
in self; # pkgsFun

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit
, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
buildInputs = [ libxslt gnome3.gtk packagekit fontconfig
libcanberra_gtk3 libnotify dbus_glib dbus_libs ];
meta = with stdenv.lib; {
homepage = https://www.freedesktop.org/software/PackageKit/;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
license = licenses.gpl2;
description = "Tools for installing software on the GNOME desktop using PackageKit";
};
}

View File

@ -0,0 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-packagekit-3.20.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-packagekit/3.20/gnome-packagekit-3.20.0.tar.xz;
sha256 = "0wf5r0qrdlalbr73fpfaapq61vlya3nwygsv4wm2bxaf56v5sjmq";
};
}