diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-09-24 13:15:50 +0200 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2017-09-24 12:15:50 +0100 |
commit | 69698ec11cc0619d84b14764fa9e708fe7e7223c (patch) | |
tree | 9d9f602554b497a3265caf5e2ef4821e12736686 /pkgs/desktops/gnome-3/apps/gnome-boxes | |
parent | 23b19efdc9c8d64177cefcaa5b919db966bb8f5e (diff) |
gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
Diffstat (limited to 'pkgs/desktops/gnome-3/apps/gnome-boxes')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 46 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix | 10 |
2 files changed, 56 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix new file mode 100644 index 0000000000000..cb8bf49254bab --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk +, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 +, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils +, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret +, libcap_ng, numactl, xen, libapparmor +}: + +# TODO: ovirt (optional) + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + enableParallelBuilding = true; + + doCheck = true; + + nativeBuildInputs = [ + makeWrapper pkgconfig intltool + ]; + + buildInputs = [ + itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc + libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd + tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive + gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret + libcap_ng numactl xen libapparmor + ]; + + preFixup = '' + for prog in "$out/bin/"*; do + 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 : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" + done + ''; + + meta = with stdenv.lib; { + description = "Simple GNOME 3 application to access remote or virtual systems"; + homepage = https://wiki.gnome.org/action/show/Apps/Boxes; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix new file mode 100644 index 0000000000000..dbed46178504c --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-boxes-3.24.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz; + sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49"; + }; +} |