From 34aea495eb39a60d0b111e748f117149cf7ac7a5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 21:36:32 +0200 Subject: gnome2.gnome_keyring: drop --- pkgs/desktops/gnome-2/default.nix | 3 --- pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix | 17 ----------------- .../gnome-2/desktop/mail-notification/default.nix | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 7e54b946c46c..2b4a8562c4f4 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -9,7 +9,6 @@ let overridden = set // overrides; set = with overridden; { gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; gnome_common = gnome-common; - gnome_keyring = gnome-keyring; gnome_desktop = gnome-desktop; inherit rarian; @@ -76,8 +75,6 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome-keyring = callPackage ./desktop/gnome-keyring { }; - libgweather = callPackage ./desktop/libgweather { }; gvfs = gvfs.override { gnome = self; }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix deleted file mode 100644 index 26f3f624a042..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, -gtk, intltool, GConf, libgnome-keyring }: - -stdenv.mkDerivation { - name = "gnome-keyring-2.30.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/2.30/gnome-keyring-2.30.3.tar.bz2; - sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; - }; - - buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ]; - - propagatedBuildInputs = [ glib libtasn1 ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index c14ee25981c7..1547c364b510 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c -- cgit 1.4.1