From f27f4be540e855f2076dde245962afc519db63ce Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 03:33:15 +0200 Subject: gnome2.gnome-control-center: drop --- .../desktop/gnome-control-center/default.nix | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix deleted file mode 100644 index c4f6ad8207c2..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, popt, which, python -, shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 -, gtk, gnome-doc-utils, intltool, GConf, libglade, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon -, libSM, docbook_xml_dtd_412 }: - -stdenv.mkDerivation { - name = "gnome-control-center-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/2.32/gnome-control-center-2.32.1.tar.bz2; - sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils - gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon - libSM docbook_xml_dtd_412 - ]; - configureFlags = "--disable-scrollkeeper"; -} -- cgit 1.4.1 From d293fca58a8f01836758af04406ec1ff0a6d9ec0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 03:34:34 +0200 Subject: gnome2.gnome-settings-daemon: drop --- pkgs/desktops/gnome-2/default.nix | 3 --- .../gnome-2/desktop/gnome-settings-daemon/default.nix | 19 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index e85be7587182..56e9c33c0d1d 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -12,7 +12,6 @@ let overridden = set // overrides; set = with overridden; { gnome_common = gnome-common; gnome_keyring = gnome-keyring; gnome_desktop = gnome-desktop; - gnome_settings_daemon = gnome-settings-daemon; inherit rarian; #### PLATFORM @@ -103,8 +102,6 @@ let overridden = set // overrides; set = with overridden; { gnome_panel = callPackage ./desktop/gnome-panel { }; - gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - gtksourceview = callPackage ./desktop/gtksourceview { }; gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix deleted file mode 100644 index 9712ce64841f..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk -, intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio -, libSM }: - -stdenv.mkDerivation { - name = "gnome-settings-daemon-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/2.32/gnome-settings-daemon-2.32.1.tar.bz2; - sha256 = "11jyn10w2p2a76pjrkd0pjl1w406df821p053awklvmdqgzb6x00"; - }; - - buildInputs = - [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit - libpulseaudio libSM - ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} -- cgit 1.4.1 From 31559eb969150976d4a4e67e6943635cfd8dcef0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 10:37:04 +0200 Subject: gnome2.gnome-panel: drop --- pkgs/desktops/gnome-2/default.nix | 3 --- .../gnome-2/desktop/gnome-panel/default.nix | 26 ---------------------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 56e9c33c0d1d..f31e531b9079 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -8,7 +8,6 @@ let overridden = set // overrides; set = with overridden; { startupnotification = libstartup_notification; gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; - gnomepanel = self.gnome_panel; gnome_common = gnome-common; gnome_keyring = gnome-keyring; gnome_desktop = gnome-desktop; @@ -100,8 +99,6 @@ let overridden = set // overrides; set = with overridden; { gnome-desktop = callPackage ./desktop/gnome-desktop { }; - gnome_panel = callPackage ./desktop/gnome-panel { }; - gtksourceview = callPackage ./desktop/gtksourceview { }; gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix deleted file mode 100644 index 3bef218740cb..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, popt, which, libxml2Python, libxslt, bzip2, python -, gtk, libXau, libcanberra-gtk2 -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop -, libwnck, librsvg, libgweather, gnome-doc-utils, libtasn1, libtool, xorg }: - -stdenv.mkDerivation { - name = "gnome-panel-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-panel/2.32/gnome-panel-2.32.1.tar.bz2; - sha256 = "0pyakxyixmcp1yhi8r1q6adhamh2waj48y397fkigj11gbmjhy4g"; - }; - - buildInputs = - [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool - ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf - gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils - libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM - ]; - - nativeBuildInputs = [ pkgconfig intltool which ]; - - configureFlags = [ "--disable-scrollkeeper" "--disable-introspection"/*not useful AFAIK*/ ]; - - NIX_CFLAGS_COMPILE="-I${GConf.dev}/include/gconf/2"; -} -- cgit 1.4.1 From 27a938b4147d328da163735ba838d2920a0bdd9a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 20:40:24 +0200 Subject: gnome2.metacity: drop --- pkgs/desktops/gnome-2/default.nix | 2 -- pkgs/desktops/gnome-2/desktop/metacity/default.nix | 18 ------------------ 2 files changed, 20 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/metacity/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index f31e531b9079..73e93109c494 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -93,8 +93,6 @@ let overridden = set // overrides; set = with overridden; { zenity = callPackage ./desktop/zenity { }; - metacity = callPackage ./desktop/metacity { }; - gnome_menus = callPackage ./desktop/gnome-menus { }; gnome-desktop = callPackage ./desktop/gnome-desktop { }; diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix deleted file mode 100644 index 95dd97568f46..000000000000 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils -, gsettings-desktop-schemas }: - -stdenv.mkDerivation { - name = "metacity-2.30.3"; - - src = fetchurl { - url = mirror://gnome/sources/metacity/2.30/metacity-2.30.3.tar.bz2; - sha256 = "1p8qzj967mmlwdl6gv9vb2vzs19czvivl0sd337lgr55iw0qgy08"; - }; - - buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2 - intltool GConf startup_notification zenity gnome-doc-utils - gsettings-desktop-schemas - ]; -} -- cgit 1.4.1 From 5d23756c7b89d6d3ce13caa2332b5e26be443b32 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 20:42:31 +0200 Subject: gnome2.gnome_menus: drop --- pkgs/desktops/gnome-2/default.nix | 2 -- pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 73e93109c494..2f7427c1415a 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -93,8 +93,6 @@ let overridden = set // overrides; set = with overridden; { zenity = callPackage ./desktop/zenity { }; - gnome_menus = callPackage ./desktop/gnome-menus { }; - gnome-desktop = callPackage ./desktop/gnome-desktop { }; gtksourceview = callPackage ./desktop/gtksourceview { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix deleted file mode 100644 index 0dcb409e0aae..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, python, glib, intltool}: - -stdenv.mkDerivation { - name = "gnome-menus-2.30.5"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-menus/2.30/gnome-menus-2.30.5.tar.bz2; - sha256 = "1ajckii51spmkgfc0168c56x0syz5vwb2fp8b81c5s6n0r85dk3d"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python glib intltool ]; -} -- cgit 1.4.1 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 --- .../networking/mailreaders/nylas-mail-bin/default.nix | 2 -- 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 +- 4 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index e7e199155d73..3376eebe5dc9 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 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 From 0e68d11b86db92a00ef39035f046525f2335f1e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 21:42:33 +0200 Subject: gnome2.zenity: drop --- pkgs/desktops/gnome-2/default.nix | 2 -- pkgs/desktops/gnome-2/desktop/zenity/default.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 6 +++--- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/zenity/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 2b4a8562c4f4..7e98973c4d2f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -84,8 +84,6 @@ let overridden = set // overrides; set = with overridden; { # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - zenity = callPackage ./desktop/zenity { }; - gnome-desktop = callPackage ./desktop/gnome-desktop { }; gtksourceview = callPackage ./desktop/gtksourceview { }; diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix deleted file mode 100644 index 0233f6340f55..000000000000 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk -, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }: - -stdenv.mkDerivation { - name = "zenity-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/2.32/zenity-2.32.1.tar.bz2; - sha256 = "1b0qxb07wif0ds1pl8xk3fq9p874j89rf718lii4ndh7382bwf48"; - }; - - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; - - nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; - - doCheck = false; # fails, tries to access the net -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d2089a484dd..97219c8a9228 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15421,10 +15421,10 @@ with pkgs; (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; inherit (self) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -21832,7 +21832,7 @@ with pkgs; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; with-shell = callPackage ../applications/misc/with-shell { }; -- cgit 1.4.1 From f82f30274307fc4617f9b6330952902d1dbe254c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 21:45:38 +0200 Subject: gnome2.libgweather: drop --- pkgs/desktops/gnome-2/default.nix | 2 -- pkgs/desktops/gnome-2/desktop/libgweather/default.nix | 14 -------------- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/libgweather/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 7e98973c4d2f..acc258dfb0bc 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -75,8 +75,6 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - libgweather = callPackage ./desktop/libgweather { }; - gvfs = gvfs.override { gnome = self; }; libgnomekbd = callPackage ./desktop/libgnomekbd { }; diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix deleted file mode 100644 index 47f2b8c90fb7..000000000000 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "libgweather-2.30.3"; - src = fetchurl { - url = "mirror://gnome/sources/libgweather/2.30/${name}.tar.bz2"; - sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq"; - }; - configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; -} -- cgit 1.4.1 From ba4835dea809e2065d9c3a343f6d5c24567cddcf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 21:46:15 +0200 Subject: gnome2.libgnomekbd: drop --- pkgs/desktops/gnome-2/default.nix | 2 -- pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index acc258dfb0bc..f12228a7991a 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -77,8 +77,6 @@ let overridden = set // overrides; set = with overridden; { gvfs = gvfs.override { gnome = self; }; - libgnomekbd = callPackage ./desktop/libgnomekbd { }; - # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix deleted file mode 100644 index b846ef888c43..000000000000 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}: - -stdenv.mkDerivation { - name = "libgnomekbd-2.32.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/2.32/libgnomekbd-2.32.0.tar.bz2; - sha256 = "0mnjhdryx94c106fghzz01dyc1vlp16wn6sajvpxffnqqx62rmfx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ]; -} -- cgit 1.4.1 From aebb64f59fa288b1b6109344a616872510ef008c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 8 Aug 2018 21:48:00 +0200 Subject: gnome2.gnome-desktop: drop --- pkgs/desktops/gnome-2/default.nix | 3 --- pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix | 16 ---------------- 2 files changed, 19 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix (limited to 'pkgs/desktops/gnome-2/desktop') diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index f12228a7991a..c41183f4b24f 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_desktop = gnome-desktop; inherit rarian; #### PLATFORM @@ -80,8 +79,6 @@ let overridden = set // overrides; set = with overridden; { # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - gnome-desktop = callPackage ./desktop/gnome-desktop { }; - gtksourceview = callPackage ./desktop/gtksourceview { }; gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix deleted file mode 100644 index b99f23555d38..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk -, intltool, GConf, gnome-doc-utils}: - -stdenv.mkDerivation { - name = "gnome-desktop-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/2.32/gnome-desktop-2.32.1.tar.bz2; - sha256 = "17bkng6ay37n3492lr9wpb49kms6gh554rn9gbjs27zygvvfrjsm"; - }; - - configureFlags = "--disable-scrollkeeper"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python libxml2Python libxslt which libX11 gtk - intltool GConf gnome-doc-utils ]; -} -- cgit 1.4.1