From 76d85e4a6fdcacf9fd4b299b189cad84e9f6bdc0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 16:44:08 +0200 Subject: gnome3.gnome-desktop: add libudev --- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/desktops') 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 ]; -- cgit 1.4.1 From 4fa19ba151e475f289c00d2c2f034e4e512dc064 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 16:45:30 +0200 Subject: gnome3.tracker-miners: do not add auto_features=enabled Meson setup hook now defaults to this. --- pkgs/desktops/gnome-3/core/tracker-miners/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/desktops') 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 = [ -- cgit 1.4.1 From ac404cfa986af52ee831d697106428ddae596328 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 17:54:53 +0200 Subject: gnome3.evince: remove auto_features=enabled from expression It is now the default. --- pkgs/desktops/gnome-3/core/evince/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/desktops') 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" -- cgit 1.4.1 From 67bca98ff7daf9cbb3d6e76996ec6f24cacd8806 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:30:28 -0400 Subject: gnome3.gnome-photos: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gnome-photos/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/desktops') 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 -- cgit 1.4.1 From f2125d701bb3ff1f1f8d71397832e6a688549791 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:32:07 -0400 Subject: gnome3.gedit: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/desktops') 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; -- cgit 1.4.1 From 16bade005dd43f810de130dd223f7e1c99749210 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:32:22 -0400 Subject: gnome3.gnome-books: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gnome-books/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/desktops') 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 -- cgit 1.4.1 From 5c3d3429f4f5816193438b317851222b461292cd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:32:47 -0400 Subject: gnome3.gnome-documents: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/desktops') 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 = [ -- cgit 1.4.1