From 9fa2ad9635d0f91f6c85eb034002bcc035bc2e07 Mon Sep 17 00:00:00 2001
From: Mayeu - Cast <Mayeu@users.noreply.github.com>
Date: Fri, 18 Mar 2016 17:16:37 +0100
Subject: librest 0.7.92 -> 0.7.93

---
 pkgs/desktops/gnome-3/3.18/core/rest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix
index eada9ab19934..344bc00780f9 100644
--- a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "rest-0.7.92";
+  name = "rest-0.7.93";
 
   src = fetchurl {
     url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-    sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec";
+    sha256 = "05mj10hhiik23ai8w4wkk5vhsp7hcv24bih5q3fl82ilam268467";
   };
 
   buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
-- 
cgit 1.4.1


From 00a794b9600716d692e3f3a61e3ffa53ca3b59c0 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Fri, 1 Apr 2016 17:02:41 +0200
Subject: gnome-boxes: add qemu to PATH

---
 pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
index 6f5af374dbc4..1edea6b888ba 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
@@ -3,7 +3,7 @@
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
 , desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
-, libusb, libarchive, acl, libgudev
+, libusb, libarchive, acl, libgudev, qemu
 }:
 
 # TODO: ovirt (optional)
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
         wrapProgram "$prog" \
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
             --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
+            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin"
     done
   '';
 
-- 
cgit 1.4.1


From e9e5cf98edcdf780b470172bcb482cf128dda026 Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Fri, 8 Apr 2016 15:42:37 +0200
Subject: lxmenu-data: init at 0.1.5

Provides menus for LXDE, or for e.g. PCManFM if no desktop environment is installed
---
 pkgs/desktops/lxde/core/lxmenu-data.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/lxde/core/lxmenu-data.nix

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
new file mode 100644
index 000000000000..b75c09d2909d
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "lxmenu-data-${version}";
+  version = "0.1.5";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz";
+    sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
+  };
+
+  buildInputs = [ intltool ];
+
+  meta = {
+    homepage = "http://lxde.org/";
+    license = stdenv.lib.licenses.gpl2;
+    description = "Freedesktop.org desktop menus for LXDE";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfb1d258ba3a..458b05181d53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5308,6 +5308,8 @@ in
 
   lxappearance = callPackage ../applications/misc/lxappearance {};
 
+  lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
+
   kona = callPackage ../development/interpreters/kona {};
 
   lolcode = callPackage ../development/interpreters/lolcode { };
-- 
cgit 1.4.1