From 713b420be8926ae13a90ddd4fdafe33f0a5c2923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2013 05:08:33 +0100 Subject: [PATCH] removed some libraries that are up-to-date on the top level --- pkgs/desktops/gnome-3/core/atk/default.nix | 38 ----------- .../gnome-3/core/gdk-pixbuf/default.nix | 33 ---------- pkgs/desktops/gnome-3/core/glib/default.nix | 44 ------------- .../core/gobject-introspection/default.nix | 28 --------- pkgs/desktops/gnome-3/core/gtk/default.nix | 63 ------------------- pkgs/desktops/gnome-3/core/pango/default.nix | 41 ------------ pkgs/desktops/gnome-3/default.nix | 19 ++---- 7 files changed, 5 insertions(+), 261 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/atk/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/glib/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gobject-introspection/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/gtk/default.nix delete mode 100644 pkgs/desktops/gnome-3/core/pango/default.nix diff --git a/pkgs/desktops/gnome-3/core/atk/default.nix b/pkgs/desktops/gnome-3/core/atk/default.nix deleted file mode 100644 index 62c610de565c..000000000000 --- a/pkgs/desktops/gnome-3/core/atk/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl, gnome3 }: - -stdenv.mkDerivation rec { - versionMajor = "2.5"; - versionMinor = "4"; - name = "atk-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/atk/${versionMajor}/atk-${versionMajor}.${versionMinor}.tar.xz"; - sha256 = "1asaq6y9cdnmji5czl9xj4cp86w9d7g78sa7ya5k6gslqj76svdg"; - }; - - buildNativeInputs = [ pkgconfig perl ]; - - propagatedBuildInputs = [ gnome3.glib ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "ATK, the accessibility toolkit"; - - longDescription = '' - ATK is the Accessibility Toolkit. It provides a set of generic - interfaces allowing accessibility technologies such as screen - readers to interact with a graphical user interface. Using the - ATK interfaces, accessibility tools have full access to view and - control running applications. - ''; - - homepage = http://library.gnome.org/devel/atk/; - - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [ raskin urkud antono ]; - platforms = stdenv.lib.platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix b/pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix deleted file mode 100644 index 6daea5abf02b..000000000000 --- a/pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, libtiff, libjpeg, libpng, libX11, xz, jasper }: - -stdenv.mkDerivation rec { - versionMajor = "2.26"; - versionMinor = "1"; - - name = "gdk-pixbuf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/${versionMajor}/gdk-pixbuf-${versionMajor}.${versionMinor}.tar.xz"; - sha256 = "1fn79r5vk1ck6xd5f7dgckbfhf2xrqq6f3389jx1bk6rb0mz22m6"; - }; - - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ]; - - buildNativeInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ gnome3.glib libtiff libjpeg libpng jasper ]; - - configureFlags = "--with-libjasper --with-x11"; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "A library for image loading and manipulation"; - - homepage = http://library.gnome.org/devel/gdk-pixbuf/; - - maintainers = [ stdenv.lib.maintainers.antono ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/glib/default.nix b/pkgs/desktops/gnome-3/core/glib/default.nix deleted file mode 100644 index 8d60e48ffee3..000000000000 --- a/pkgs/desktops/gnome-3/core/glib/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi, python, pcre }: - -stdenv.mkDerivation rec { - versionMajor = "2.33"; - versionMinor = "3"; - moduleName = "glib"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1409vc8ac296x341s80q36qvgbzpwpcvxg2xdis5w1vzzxfnkqja"; - }; - - # configure script looks for d-bus but it is only needed for tests - buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl pkgconfig gettext python ]; - - propagatedBuildInputs = [ zlib libffi ]; - - configureFlags = "--disable-fam"; - - passthru.gioModuleDir = "lib/gio/modules"; - - postInstall = "rm -rvf $out/share/gtk-doc"; - - meta = { - description = "GLib, a C library of programming buildings blocks"; - - longDescription = '' - GLib provides the core application building blocks for libraries - and applications written in C. It provides the core object - system used in GNOME, the main loop implementation, and a large - set of utility functions for strings and common data structures. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [ raskin urkud antono ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gobject-introspection/default.nix b/pkgs/desktops/gnome-3/core/gobject-introspection/default.nix deleted file mode 100644 index b630e210762d..000000000000 --- a/pkgs/desktops/gnome-3/core/gobject-introspection/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, cairo }: - -stdenv.mkDerivation rec { - - versionMajor = "1.33"; - versionMinor = "3"; - moduleName = "gobject-introspection"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1dziqpas9hg2nkyzy6l53mrjnp2argfszj4cqzdw7ia0zfccmc4q"; - }; - - buildInputs = [ flex bison glib pkgconfig python ]; - propagatedBuildInputs = [ libffi ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = with stdenv.lib; { - maintainers = [ maintainers.antono ]; - platforms = platforms.linux; - homepage = http://live.gnome.org/GObjectIntrospection; - }; - - configureFlags = [ "--disable-tests" ]; -} diff --git a/pkgs/desktops/gnome-3/core/gtk/default.nix b/pkgs/desktops/gnome-3/core/gtk/default.nix deleted file mode 100644 index 6fb9d05ece8e..000000000000 --- a/pkgs/desktops/gnome-3/core/gtk/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, cairo, perl, xlibs -, xz -, xineramaSupport ? true -, cupsSupport ? true, cups ? null -}: - -assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null; - -stdenv.mkDerivation rec { - versionMajor = "3.5"; - versionMinor = "6"; - moduleName = "gtk+"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1088d5n3yzzjxm13c29sys83m28dmd5b95i1wxc6459vq2d4l14g"; - }; - - enableParallelBuilding = true; - - configureFlags = - [ "--without-atk-bridge" - "--enable-gtk-doc-html=no" - "--enable-x11-backend" - "--disable-tests" - ]; - - buildNativeInputs = [ perl pkgconfig ]; - - propagatedBuildInputs = - [ xlibs.xlibs gnome3.glib gnome3.atk gnome3.gdk_pixbuf gnome3.pango cairo - xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi - ] - ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [ urkud raskin antono ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/pango/default.nix b/pkgs/desktops/gnome-3/core/pango/default.nix deleted file mode 100644 index 86ec72fec2fd..000000000000 --- a/pkgs/desktops/gnome-3/core/pango/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: - -stdenv.mkDerivation rec { - - versionMajor = "1.30"; - versionMinor = "1"; - moduleName = "pango"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1ghc49b5ahv2is7hlq6is5jbpkvhx5kkays6spf2s9rw2hg0d31s"; - }; - - buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; - - buildNativeInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ x11 glib cairo libpng ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "A library for laying out and rendering of text, with an emphasis on internationalization"; - - longDescription = '' - Pango is a library for laying out and rendering of text, with an - emphasis on internationalization. Pango can be used anywhere - that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. - ''; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f35a4f40d91f..cdf44142c90c 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -1,6 +1,9 @@ -{ callPackage, lib, self, stdenv, gettext, overrides ? {} }: +{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }: -{ +rec { + inherit (pkgs) fetchurl_gnome glib gtk3 atk pango; + gtk = gtk3; + orbit = pkgs.gnome2.ORBit2; inherit (lib) lowPrio hiPrio appendToName makeOverridable; @@ -12,24 +15,12 @@ at_spi2_core = callPackage ./core/at-spi2-core { }; - atk = callPackage ./core/atk { }; - gconf = callPackage ./core/gconf { }; - gdk_pixbuf = callPackage ./core/gdk-pixbuf { }; - - glib = callPackage ./core/glib { }; - - gobject_introspection = callPackage ./core/gobject-introspection { }; - - gtk = callPackage ./core/gtk { }; - gnome_terminal = callPackage ./core/gnome-terminal { }; gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { }); - pango = callPackage ./core/pango { }; - vte = callPackage ./core/vte { }; zenity = callPackage ./core/zenity { };