From e2414dcbaac057509d7a29feefceb3bc0bd678c4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 9 Aug 2018 23:27:15 +0200 Subject: [PATCH 1/6] pan: clean up --- pkgs/applications/networking/newsreaders/pan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 4a1940ae654..9d51a76f536 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -2,7 +2,7 @@ , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null , perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls , makeWrapper, gnupg -, gnomeSupport ? true, libgnome-keyring3 +, gnomeSupport ? true, gnome3, libsecret }: assert spellChecking -> gtkspell3 != null; @@ -17,10 +17,10 @@ stdenv.mkDerivation { sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ] + nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ]; + buildInputs = [ gtk3 gmime2 libnotify gnutls ] ++ stdenv.lib.optional spellChecking gtkspell3 - ++ stdenv.lib.optional gnomeSupport libgnome-keyring3; + ++ stdenv.lib.optionals gnomeSupport [ libsecret gnome3.gcr ]; configureFlags = [ "--with-dbus" From 1bd430e3d444aa566d55a668f424033e2dcc782f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 10 Aug 2018 01:04:52 +0200 Subject: [PATCH 2/6] gnome3.gnome-keyring: clean up --- .../gnome-3/core/gnome-keyring/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) 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; From 64ddf1de6d029183beda7a7e7409ded4676a5725 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 11 Aug 2018 14:09:29 +0200 Subject: [PATCH 3/6] xfce.xfce4-settings: remove unneeded dependency https://bluesabre.org/2018/06/20/xfce-settings-4-12-4-and-4-13-4-released/ --- pkgs/desktops/xfce4-13/xfce4-settings/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 From b47e4e76445e22b6d0d575242ab09c243b2de012 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 Aug 2018 01:42:24 +0200 Subject: [PATCH 4/6] modemmanager: remove unneeded dependency --- pkgs/tools/networking/modem-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 8612808687e..6ca8c892562 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig +{ stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig , libmbim, libqmi, systemd, fetchpatch }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext pkgconfig ]; - buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; + buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; patches = [ # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) From 6e2c1152350a1080e84da36941651e59c64f568d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 Aug 2018 14:28:18 +0200 Subject: [PATCH 5/6] gnome3.gnome-desktop: use substituteAll for patch --- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 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"; From 2258383b827ca50308838cab3c11869982764bc0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 Aug 2018 14:08:00 +0200 Subject: [PATCH 6/6] umockdev: split package --- pkgs/development/libraries/umockdev/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 1ff71fa1811..b89450b810b 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool +{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobjectIntrospection , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { name = "umockdev-${version}"; version = "0.11.3"; + outputs = [ "bin" "out" "dev" "doc" ]; + src = fetchFromGitHub { owner = "martinpitt"; repo = "umockdev"; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig vala ]; + nativeBuildInputs = [ autoreconfHook pkgconfig vala gobjectIntrospection ]; enableParallelBuilding = true;