diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-10 08:52:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-10 08:52:04 +0200 |
commit | fb6260fcf7c126619962978b366f230cd61afe3e (patch) | |
tree | c42b49ff621ee9f1ac9e4403c84154672c374bdd /pkgs/desktops | |
parent | d2c3c1f2bb169b15d649177865cb7cd9fc60459b (diff) | |
parent | 74c24385cb2864f937031df74af14fc8060e1540 (diff) | |
download | nixlib-fb6260fcf7c126619962978b366f230cd61afe3e.tar nixlib-fb6260fcf7c126619962978b366f230cd61afe3e.tar.gz nixlib-fb6260fcf7c126619962978b366f230cd61afe3e.tar.bz2 nixlib-fb6260fcf7c126619962978b366f230cd61afe3e.tar.lz nixlib-fb6260fcf7c126619962978b366f230cd61afe3e.tar.xz nixlib-fb6260fcf7c126619962978b366f230cd61afe3e.tar.zst nixlib-fb6260fcf7c126619962978b366f230cd61afe3e.zip |
Merge pull request #64236 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/desktops')
7 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 532e8dcb0f08..2dcd265e2e48 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl ''; - mesonFlags = [ - "--buildtype=plain" # don't require git - ]; - # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index b9fb2dc05a06..6edf86ec552b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4"; }; - mesonFlags = [ - "--buildtype=plain" - ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 6f171d744a55..e0f28bc3446d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgetting-started=true" - "--buildtype=plain" ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 0a33a3bff559..9d08cc24aadb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -34,10 +34,6 @@ in stdenv.mkDerivation rec { dbus ]; - mesonFlags = [ - "--buildtype=plain" # don't do any git commands - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 6e7f0716eefb..68beb0e47e35 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); mesonFlags = [ - "-Dauto_features=enabled" "-Dnautilus=false" "-Dps=enabled" "-Dgtk_doc=false" diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 2e6bb44b874f..4beeb190f025 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland -, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: +, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; @@ -13,15 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection gtk-doc docbook_xsl ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland - gtk3 glib libseccomp + gtk3 glib libseccomp systemd ]; propagatedBuildInputs = [ gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 66aeff1bf4de..eaa3ab3c089b 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { "-Dfunctional_tests=false" "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" - "-Dauto_features=enabled" ]; patches = [ |