about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-04-03 11:01:57 +0000
committerRobin Gloster <mail@glob.in>2016-04-03 11:01:57 +0000
commit696d85a62d8418e8b33f5f95b932b82706f8d338 (patch)
tree7afed180c5eb396a567c5a20a4a59859299c6f14 /pkgs/desktops/gnome-3
parent5df521abdabe5d294811b9824a5839b1ebbd3127 (diff)
parentb8755a4cdf8dd426ac642c006825d302dfe5f4b1 (diff)
downloadnixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar
nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.gz
nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.bz2
nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.lz
nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.xz
nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.zst
nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r--pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.18/core/rest/default.nix4
2 files changed, 4 insertions, 4 deletions
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
   '';
 
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];