diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
| commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
| tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/desktops/gnome-3 | |
| parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
| parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
| download | nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixlib-30f14243c33f1b386273d08a4776aa679c42143d.zip | |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/rest/default.nix | 4 |
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]; |