diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/desktops/gnome-2 | |
parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/desktops/gnome-2')
14 files changed, 1 insertions, 234 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 80f2c9ce70d7..c41183f4b24f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -8,12 +8,7 @@ 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; - gnome_settings_daemon = gnome-settings-daemon; - gnome_control_center = gnome-control-center; inherit rarian; #### PLATFORM @@ -58,8 +53,6 @@ let overridden = set // overrides; set = with overridden; { gnome_vfs = callPackage ./platform/gnome-vfs { }; - gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { }; - libgnome = callPackage ./platform/libgnome { }; libgnomeui = callPackage ./platform/libgnomeui { }; @@ -68,8 +61,6 @@ let overridden = set // overrides; set = with overridden; { libbonoboui = callPackage ./platform/libbonoboui { }; - at_spi = callPackage ./platform/at-spi { }; - gtkhtml = callPackage ./platform/gtkhtml { }; gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; @@ -83,31 +74,11 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome-keyring = callPackage ./desktop/gnome-keyring { }; - - libgweather = callPackage ./desktop/libgweather { }; - gvfs = gvfs.override { gnome = self; }; - libgnomekbd = callPackage ./desktop/libgnomekbd { }; - # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - zenity = callPackage ./desktop/zenity { }; - - metacity = callPackage ./desktop/metacity { }; - - gnome_menus = callPackage ./desktop/gnome-menus { }; - - gnome-desktop = callPackage ./desktop/gnome-desktop { }; - - gnome_panel = callPackage ./desktop/gnome-panel { }; - - gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - - gnome-control-center = callPackage ./desktop/gnome-control-center { }; - gtksourceview = callPackage ./desktop/gtksourceview { }; gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; 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 b4d82e0cffbc..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" ]; -} 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 d3d364998865..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 ]; -} 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/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 ]; -} 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"; -} 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 ]; -} 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 ]; -} 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 b358c3126747..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 ]; -} 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 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 - ]; -} 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 5eb0068e2cdf..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/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix deleted file mode 100644 index 9bcc9ab6cabe..000000000000 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2, GConf, dbus-glib }: - -stdenv.mkDerivation { - name = "at-spi-1.32.0"; - - src = fetchurl { - url = mirror://gnome/sources/at-spi/1.32/at-spi-1.32.0.tar.bz2; - sha256 = "0fbh0afzw1gm4r2w68b8l0vhnia1qyzdl407vyxfw4v4fkm1v16c"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 GConf dbus-glib ]; -} diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix deleted file mode 100644 index 5ae126df331c..000000000000 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}: - -stdenv.mkDerivation { - name = "gnome-vfs-monikers-2.15.3"; - src = fetchurl { - url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2; - sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool gnome_vfs libbonobo ]; -} |