diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-08 21:36:32 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 17:36:48 +0200 |
| commit | 34aea495eb39a60d0b111e748f117149cf7ac7a5 (patch) | |
| tree | 7dd956278351c4c3fb867cfd419180e77b822fbe /pkgs | |
| parent | 6b2a175c5e00224fda6ba509067a440d810d7b50 (diff) | |
| download | nixpkgs-34aea495eb39a60d0b111e748f117149cf7ac7a5.tar nixpkgs-34aea495eb39a60d0b111e748f117149cf7ac7a5.tar.gz nixpkgs-34aea495eb39a60d0b111e748f117149cf7ac7a5.tar.bz2 nixpkgs-34aea495eb39a60d0b111e748f117149cf7ac7a5.tar.lz nixpkgs-34aea495eb39a60d0b111e748f117149cf7ac7a5.tar.xz nixpkgs-34aea495eb39a60d0b111e748f117149cf7ac7a5.tar.zst nixpkgs-34aea495eb39a60d0b111e748f117149cf7ac7a5.zip | |
gnome2.gnome_keyring: drop
Diffstat (limited to 'pkgs')
4 files changed, 1 insertions, 23 deletions
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index e7e199155d7..3376eebe5dc 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -81,8 +81,6 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome-keyring ]; - nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 7e54b946c46..2b4a8562c4f 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 26f3f624a04..00000000000 --- 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 c14ee25981c..1547c364b51 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 |