@@ -1,16 +1,57 @@
1−{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
2−, glib, gobject-introspection, libxml2, gtk3, gtk-vnc, freerdp, libvirt, spice-gtk, python3
3−, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
4−, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
5−, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, libsecret
6−, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, wrapGAppsHook
6+, pkgconfig
7+, gettext
8+, itstool
9+, libvirt-glib
10+, glib
11+, gobject-introspection
12+, libxml2
13+, gtk3
14+, gtk-vnc
15+, freerdp
16+, libvirt
17+, spice-gtk
18+, python3
19+, spice-protocol
20+, libsoup
21+, libosinfo
22+, systemd
23+, tracker
24+, tracker-miners
25+, vala
26+, libcap
27+, yajl
28+, gmp
29+, gdbm
30+, cyrus_sasl
31+, gnome3
32+, librsvg
33+, desktop-file-utils
34+, mtools
35+, cdrkit
36+, libcdio
37+, libusb
38+, libarchive
39+, acl
40+, libgudev
41+, libsecret
42+, libcap_ng
43+, numactl
44+, xen
45+, libapparmor
46+, json-glib
47+, webkitgtk
48+, vte
49+, glib-networking
750}:
851
9−let
10− version = "3.34.1";
11−in stdenv.mkDerivation rec {
52+stdenv.mkDerivation rec {
1253 pname = "gnome-boxes";
13− inherit version;
54+ version = "3.34.1";
1455
1556 src = fetchurl {
1657 url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -20,18 +61,58 @@ in stdenv.mkDerivation rec {
2061 doCheck = true;
2162
2263 nativeBuildInputs = [
23− meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobject-introspection desktop-file-utils python3
64+ desktop-file-utils
65+ gettext
66+ gobject-introspection
67+ itstool
68+ meson
69+ ninja
70+ pkgconfig
71+ python3
72+ vala
73+ wrapGAppsHook
2474 ];
2575
2676 # Required for USB redirection PolicyKit rules file
27− propagatedUserEnvPkgs = [ spice-gtk ];
77+ propagatedUserEnvPkgs = [
78+ spice-gtk
79+ ];
2880
2981 buildInputs = [
30− libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
31− libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
32− tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
33− gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
34− libcap_ng numactl xen libapparmor vte
82+ acl
83+ cyrus_sasl
84+ freerdp
85+ gdbm
86+ glib
87+ glib-networking
88+ gmp
89+ gnome3.adwaita-icon-theme
90+ gtk-vnc
91+ gtk3
92+ json-glib
93+ libapparmor
94+ libarchive
95+ libcap
96+ libcap_ng
97+ libgudev
98+ libosinfo
99+ librsvg
100+ libsecret
101+ libsoup
102+ libusb
103+ libvirt
104+ libvirt-glib
105+ libxml2
106+ numactl
107+ spice-gtk
108+ spice-protocol
109+ systemd
110+ tracker
111+ tracker-miners
112+ vte
113+ webkitgtk
114+ xen
115+ yajl
35116 ];
36117
37118 preFixup = ''
@@ -45,8 +126,8 @@ in stdenv.mkDerivation rec {
45126
46127 passthru = {
47128 updateScript = gnome3.updateScript {
48− packageName = "gnome-boxes";
49− attrPath = "gnome3.gnome-boxes";
129+ packageName = pname;
130+ attrPath = "gnome3.${pname}";
50131 };
51132 };
52133