Merge branch 'master' into staging-next

A mass darwin rebuild from master (#55784).
This commit is contained in:
Vladimír Čunát
2019-02-17 08:05:24 +01:00
62 changed files with 838 additions and 413 deletions
@@ -4,7 +4,7 @@
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese
, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session
, fontconfig, sound-theme-freedesktop, grilo, python3 }:
let
@@ -46,6 +46,10 @@ in stdenv.mkDerivation rec {
patchShebangs build-aux/meson/meson_post_install.py
'';
mesonFlags = [
"-Dgnome_session_libexecdir=${gnome-session}/libexec"
];
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gnome-chess-${version}";
version = "3.30.0";
version = "3.30.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "153wwh0861qfg53myyc3iwlqm989lbhdrlmsxaibmkxv3pgpl7ma";
sha256 = "1gzdm6z54kxx06lh616g33klrp4dby2a68wxvjpsavdll28kgwgl";
};
nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];