diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/desktops/gnome-3/core | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/core')
3 files changed, 2 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index 6e7f0716eefb..68beb0e47e35 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 2e6bb44b874f..4beeb190f025 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 66aeff1bf4de..eaa3ab3c089b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/nixpkgs/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 = [ |