diff --git a/pkgs/development/libraries/gnome/atk/default.nix b/pkgs/development/libraries/gnome/atk/default.nix deleted file mode 100644 index 72aef00555d..00000000000 --- a/pkgs/development/libraries/gnome/atk/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, glib, perl}: - -assert pkgconfig != null && glib != null && perl != null; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig perl]; - propagatedBuildInputs = [glib]; -} diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix index ac52efc0f8a..ffae4036044 100644 --- a/pkgs/development/libraries/gnome/default.nix +++ b/pkgs/development/libraries/gnome/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, pkgconfig, audiofile , flex, bison, popt, perl, zlib, libxml2, bzip2 , perlXMLParser, gettext, x11, libtiff, libjpeg -, libpng +, libpng, gtkLibs }: rec { @@ -14,26 +14,13 @@ rec { inherit stdenv fetchurl; }; - glib = (import ./glib) { - inherit fetchurl stdenv pkgconfig gettext perl; - input = platform.glib; - }; + glib = gtkLibs.glib; - atk = (import ./atk) { - inherit fetchurl stdenv pkgconfig glib perl; - input = platform.atk; - }; + atk = gtkLibs.atk; - pango = (import ./pango) { - inherit fetchurl stdenv pkgconfig glib x11; - input = platform.pango; - }; + pango = gtkLibs.pango; - gtk = (import ./gtk+) { - inherit fetchurl stdenv pkgconfig glib atk pango perl - libtiff libjpeg libpng x11; - input = platform.gtk; - }; + gtk = gtkLibs.gtk; esound = (import ./esound) { inherit fetchurl stdenv audiofile; @@ -118,7 +105,7 @@ rec { libbonoboui = (import ./libbonoboui) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade - libgnome libgnomecanvas; + libgnome libgnomecanvas gettext; input = platform.libbonoboui; }; diff --git a/pkgs/development/libraries/gnome/glib/default.nix b/pkgs/development/libraries/gnome/glib/default.nix deleted file mode 100644 index 91e155f67d7..00000000000 --- a/pkgs/development/libraries/gnome/glib/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, gettext, perl}: - -assert pkgconfig != null && gettext != null && perl != null; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig gettext perl]; -} diff --git a/pkgs/development/libraries/gnome/gtk+/default.nix b/pkgs/development/libraries/gnome/gtk+/default.nix deleted file mode 100644 index 3ffdd4517c2..00000000000 --- a/pkgs/development/libraries/gnome/gtk+/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, x11, glib, atk -, pango, perl, libtiff, libjpeg, libpng}: - -assert pkgconfig != null && x11 != null && glib != null && atk != null - && pango != null && perl != null && perl != null && libtiff != null - && libjpeg != null && libpng != null; -assert x11.buildClientLibs; -#assert glib == atk.glib; -#assert glib == pango.glib; -#assert x11 == pango.x11; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig perl libtiff libjpeg libpng]; - propagatedBuildInputs = [x11 glib atk pango]; - inherit libtiff libjpeg libpng; -} diff --git a/pkgs/development/libraries/gnome/libbonoboui/default.nix b/pkgs/development/libraries/gnome/libbonoboui/default.nix index 51263a33075..2cc8527ade1 100644 --- a/pkgs/development/libraries/gnome/libbonoboui/default.nix +++ b/pkgs/development/libraries/gnome/libbonoboui/default.nix @@ -1,5 +1,5 @@ -{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome -, libgnomecanvas}: +{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome +, libgnomecanvas, gettext}: assert pkgconfig != null && perl != null && libxml2 != null && libglade != null && libgnome != null && libgnomecanvas != null; @@ -7,7 +7,7 @@ assert pkgconfig != null && perl != null && libxml2 != null # todo 2.8.1 doesn;t work stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig perl libglade]; + buildInputs = [pkgconfig perl libglade gettext]; propagatedBuildInputs = [libxml2 libgnome libgnomecanvas]; PERL5LIB = perlXMLParser ~ "/lib/site_perl"; diff --git a/pkgs/development/libraries/gnome/pango/default.nix b/pkgs/development/libraries/gnome/pango/default.nix deleted file mode 100644 index 2c7b67ad996..00000000000 --- a/pkgs/development/libraries/gnome/pango/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, x11, glib}: - -assert pkgconfig != null && x11 != null && glib != null; -assert x11.buildClientLibs; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [x11 glib]; -}