summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2016-06-16 19:19:12 +0000
committerMatthew Bauer <mjbauer95@gmail.com>2016-07-05 20:27:28 +0000
commit4d4746e43610f3a37223a66b9a48087962883266 (patch)
tree8f957543ba6369a5c075ce52ed6fd8b69db0cca8
parent4e50880c828a771ab9ea72739bb70017b724358c (diff)
downloadnixpkgs-4d4746e43610f3a37223a66b9a48087962883266.tar
nixpkgs-4d4746e43610f3a37223a66b9a48087962883266.tar.gz
nixpkgs-4d4746e43610f3a37223a66b9a48087962883266.tar.bz2
nixpkgs-4d4746e43610f3a37223a66b9a48087962883266.tar.lz
nixpkgs-4d4746e43610f3a37223a66b9a48087962883266.tar.xz
nixpkgs-4d4746e43610f3a37223a66b9a48087962883266.tar.zst
nixpkgs-4d4746e43610f3a37223a66b9a48087962883266.zip
gnome3.18: use packagekit bindings for gnome-software
- init gnome-software for gnome3 at 3.18.3
- list gnome-software as an "optional package" for gnome3
- enable packagekit service when gnome3 is enabled
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix1
-rw-r--r--pkgs/desktops/gnome-3/3.18/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix31
3 files changed, 35 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 27ec65c3d8e..051c99dcb9f 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -121,6 +121,7 @@ in {
     services.upower.enable = config.powerManagement.enable;
     services.dbus.packages = mkIf config.services.printing.enable [ pkgs.system-config-printer ];
     services.colord.enable = mkDefault true;
+    services.packagekit.enable = mkDefault true;
     hardware.bluetooth.enable = mkDefault true;
 
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index d0a113ff0a4..2990ad82a84 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -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-software
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -390,6 +390,8 @@ let
 
   gnome-video-effects = callPackage ./misc/gnome-video-effects { };
 
+  gnome-software = callPackage ./misc/gnome-software { };
+
     };
   in self; # pkgsFun
 
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix
new file mode 100644
index 00000000000..424f6a4f541
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
+, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-software-${version}";
+  version = "3.18.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-software/3.18/${name}.tar.xz";
+    sha256 = "0ywvjmn0cwr4kv2l6ic80ac7js7hpsp3g127cj7h256iaqgsaxnc";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+  buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
+                  gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
+                  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.";
+  };
+}