public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibmm and gtkmm moved into gtkLibs

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10478
This commit is contained in:
Yury G. Kudryashov 2008-02-03 13:18:37 +00:00
parent 2ca177e6ae
commit 00af084c1c
6 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gtk-libs/2.10/default.nix
View File

@ -9,4 +9,8 @@ rec {
pango = (import ./pango) (args // { inherit glib; });
gtk = (import ./gtk+) (args // { inherit glib atk pango; } );
glibmm = (import ./glibmm) (args // { inherit glib; });
gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm; });
}

3
pkgs/development/libraries/gtk-libs/2.10/glibmm/default.nix
View File

@ -7,6 +7,7 @@ stdenv.mkDerivation {
sha256 = "02rjjdh0f6kafa1sn4y5ykvm4f2qn3yh4kr4lngcv7vzasqn1dr1";
};
buildInputs = [pkgconfig glib libsigcxx];
buildInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
}

10
pkgs/development/libraries/gtk-libs/2.10/gtk+/default.nix
View File

@ -6,10 +6,8 @@ stdenv.mkDerivation {
url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.14.tar.bz2;
sha256 = "1qjdx9kdc533dajdy1kv3ssxzh7gz7j7vzgw0ax910q4klil88yh";
};
buildInputs = [
pkgconfig perl libtiff libjpeg libpng cairo libXrandr
(if xineramaSupport then libXinerama else null)
];
propagatedBuildInputs = [x11 glib atk pango];
inherit libtiff libjpeg libpng;
buildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [x11 glib atk pango libtiff libjpeg libpng cairo
libXrandr (if xineramaSupport then libXinerama else null)];
passthru = { inherit libtiff libjpeg libpng; };
}

3
pkgs/development/libraries/gtk-libs/2.10/gtkmm/default.nix
View File

@ -7,6 +7,7 @@ stdenv.mkDerivation {
sha256 = "1bri9r0k69dmi5xgzrlfllp3adfzhz8dh9zkcvi6sjkgfwi594vx";
};
buildInputs = [pkgconfig gtk atk glibmm libsigcxx];
buildInputs = [pkgconfig];
propagatedBuildInputs = [glibmm gtk atk cairomm];
}

4
pkgs/development/libraries/gtk-libs/2.10/pango/default.nix
View File

@ -6,6 +6,6 @@ stdenv.mkDerivation {
url = ftp://ftp.gtk.org/pub/pango/1.14/pango-1.14.10.tar.bz2;
md5 = "e9fc2f8168e74e2fa0aa8238ee0e9c06";
};
buildInputs = [pkgconfig libpng];
propagatedBuildInputs = [x11 glib cairo];
buildInputs = [pkgconfig];
propagatedBuildInputs = [x11 glib cairo libpng];
}

19
pkgs/top-level/all-packages.nix
View File

@ -1955,11 +1955,6 @@ rec {
#installLocales = false;
});
glibmm = import ../development/libraries/gtk-libs/2.6/glibmm {
inherit fetchurl stdenv pkgconfig libsigcxx;
inherit (gtkLibs26) glib;
};
gmime = import ../development/libraries/gmime {
inherit fetchurl stdenv pkgconfig zlib;
inherit (gtkLibs) glib;
@ -2001,7 +1996,7 @@ rec {
gtkLibs210 = import ../development/libraries/gtk-libs/2.10 {
inherit fetchurl stdenv pkgconfig gettext perl x11
libtiff libjpeg libpng cairo;
libtiff libjpeg libpng cairo libsigcxx cairomm;
inherit (xlibs) libXinerama libXrandr;
xineramaSupport = true;
};
@ -2011,12 +2006,6 @@ rec {
libtiff libjpeg libpng;
};
gtkmm = import ../development/libraries/gtk-libs/2.6/gtkmm {
inherit fetchurl stdenv pkgconfig libsigcxx;
inherit (gtkLibs26) gtk atk;
inherit glibmm;
};
gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {
inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
inherit (gnome) gtk;
@ -4220,9 +4209,9 @@ rec {
inkscape = import ../applications/graphics/inkscape {
inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
glibmm libsigcxx lcms boost gettext;
inherit (gtkLibs) gtk glib;
popt libxml2 libxslt libpng boehmgc fontconfig
libsigcxx lcms boost gettext cairomm;
inherit (gtkLibs) gtk glib glibmm gtkmm;
inherit (xlibs) libXft;
};