diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 27 | ||||
-rw-r--r-- | pkgs/desktops/xfce4-13/xfce4-settings/default.nix | 3 |
3 files changed, 20 insertions, 22 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index e909a356866..d6402a3b5b6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib +{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib , intltool, libxml2, xkeyboard_config, isocodes, itstool, wayland , libseccomp, bubblewrap, gobjectIntrospection, gtk-doc, docbook_xsl }: @@ -30,18 +30,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; patches = [ - ./bubblewrap-paths.patch + (substituteAll { + src = ./bubblewrap-paths.patch; + BUBBLEWRAP_BIN = "${bubblewrap}/bin/bwrap"; + }) ]; configureFlags = [ "--enable-gtk-doc" ]; - postPatch = '' - substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \ - BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = "gnome-desktop"; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index acb32bc174c..cce192c9f29 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook -, docbook_xsl, docbook_xml_dtd_42, gnome3 }: +{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt +, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook +, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { name = "gnome-keyring-${version}"; @@ -11,21 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; }; - }; - outputs = [ "out" "dev" ]; - buildInputs = with gnome3; [ - dbus libgcrypt pam gtk3 libgnome-keyring openssh - pango gcr gdk_pixbuf atk p11-kit + buildInputs = [ + glib libgcrypt pam openssh libcap_ng libselinux + gcr p11-kit ]; - propagatedBuildInputs = [ glib libtasn1 libxslt ]; - nativeBuildInputs = [ - pkgconfig intltool docbook_xsl docbook_xml_dtd_42 wrapGAppsHook + pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook ]; configureFlags = [ @@ -48,6 +42,13 @@ stdenv.mkDerivation rec { make check ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-keyring"; + attrPath = "gnome3.gnome-keyring"; + }; + }; + meta = with stdenv.lib; { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = https://wiki.gnome.org/Projects/GnomeKeyring; diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix index d08c1f96fdd..6eb917fd76f 100644 --- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, dbus-glib, exo, garcon, gtk3 +{ mkXfceDerivation, automakeAddFlags, exo, garcon, gtk3 , libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null , upower ? null, xfconf, xf86inputlibinput ? null }: @@ -19,7 +19,6 @@ mkXfceDerivation rec { nativeBuildInputs = [ automakeAddFlags ]; buildInputs = [ - dbus-glib exo garcon gtk3 |