diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-18 08:26:30 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-18 08:26:30 +0200 |
commit | 2346182c2c8126411f93486ecf4d66df70709281 (patch) | |
tree | d46de03a507e720fac4dae249ffdc530d412b963 /pkgs/desktops/gnome-3/core | |
parent | 5b7f58701c9c3a92e8307d825580166e54a2e25d (diff) | |
parent | 9d87ccabce3516cf1cf5654bd95cdc9471f8615e (diff) | |
download | nixpkgs-2346182c2c8126411f93486ecf4d66df70709281.tar nixpkgs-2346182c2c8126411f93486ecf4d66df70709281.tar.gz nixpkgs-2346182c2c8126411f93486ecf4d66df70709281.tar.bz2 nixpkgs-2346182c2c8126411f93486ecf4d66df70709281.tar.lz nixpkgs-2346182c2c8126411f93486ecf4d66df70709281.tar.xz nixpkgs-2346182c2c8126411f93486ecf4d66df70709281.tar.zst nixpkgs-2346182c2c8126411f93486ecf4d66df70709281.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/grilo-plugins/default.nix | 67 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/rygel/default.nix | 85 |
3 files changed, 125 insertions, 31 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 57924dce5b0..74f05012177 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -9,7 +9,7 @@ , gtk3, glib, glib-networking, gsettings-desktop-schemas , gnome-desktop, gnome-settings-daemon, gnome-online-accounts , vino, gnome-bluetooth, tracker, adwaita-icon-theme -, udisks2, gsound, libhandy, cups }: +, udisks2, gsound, libhandy, cups, mutter }: stdenv.mkDerivation rec { pname = "gnome-control-center"; @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" + # WM keyboard shortcuts + --prefix XDG_DATA_DIRS : "${mutter}/share" ) for i in $out/share/applications/*; do substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index 02e0c29fdaa..2e8c3c4a003 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,24 +1,67 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart -, gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, gperf +, sqlite +, librest +, libarchive +, libsoup +, gnome3 +, libxml2 +, lua5_3 +, liboauth +, libgdata +, libmediaart +, grilo +, gnome-online-accounts +, gmime +, json-glib +, avahi +, tracker +, dleyna-server +, itstool +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo-plugins"; version = "0.3.8"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0nync07gah3jkpb5ph5d3gwbygmabnih2m3hfz7lkvjl2l5pgpac"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + itstool + gperf # for lua-factory + ]; + buildInputs = [ - gnome3.grilo libxml2 gupnp gssdp libgdata - lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts - totem-pl-parser librest gmime json-glib - avahi libmediaart tracker dleyna-server + grilo + libxml2 + libgdata + lua5_3 + liboauth + sqlite + gnome-online-accounts + totem-pl-parser + librest + libarchive + libsoup + gmime + json-glib + avahi + libmediaart + tracker + dleyna-server ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 5d60500b363..09ff43041fd 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -1,41 +1,90 @@ -{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobject-introspection, gtk-doc, wrapGAppsHook, glib, gssdp, gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, libsoup, gtk3, libmediaart, sqlite, systemd, tracker, shared-mime-info, gnome3 }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, vala +, gettext +, libxml2 +, gobject-introspection +, gtk-doc +, wrapGAppsHook +, python3 +, glib +, gssdp +, gupnp +, gupnp-av +, gupnp-dlna +, gst_all_1 +, libgee +, libsoup +, gtk3 +, libmediaart +, sqlite +, systemd +, tracker +, shared-mime-info +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "rygel"; - version = "0.36.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.38.0"; # TODO: split out lib outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0i12z6bzfzgcjidhxa2jsvpm4hqpab0s032z13jy2vbifrncfcnk"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc"; }; nativeBuildInputs = [ - pkgconfig vala gettext libxml2 gobject-introspection gtk-doc wrapGAppsHook + meson + ninja + pkgconfig + vala + gettext + libxml2 + gobject-introspection + gtk-doc + wrapGAppsHook + python3 ]; + buildInputs = [ - glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info + glib + gssdp + gupnp + gupnp-av + gupnp-dlna + libgee + libsoup + gtk3 + libmediaart + sqlite + systemd + tracker + shared-mime-info ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly ]); - configureFlags = [ - "--with-systemduserunitdir=$(out)/lib/systemd/user" - "--enable-apidocs" + mesonFlags = [ + "-Dsystemd-user-units-dir=${placeholder "out"}/lib/systemd/user" + "-Dapi-docs=true" "--sysconfdir=/etc" ]; - installFlags = [ - "sysconfdir=$(out)/etc" - ]; - doCheck = true; - enableParallelBuilding = true; + postPatch = '' + patchShebangs data/xml/process-xml.py + ''; passthru = { updateScript = gnome3.updateScript { |