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

* Update to GTK 2.4.0.

Browse Source 
svn path=/nixpkgs/trunk/; revision=906
This commit is contained in:
Eelco Dolstra 2004-04-02 13:58:55 +00:00
parent 36356d7694
commit de759967c8
11 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/TODO
View File

@ -8,5 +8,11 @@
* Bug in ld-wrapper: should source in add-flags (like gcc-wrapper) - then fix uml builder
* In setup.sh: move "test -x $configureScript" into "if test -z $configureScript..."
* In setup.sh: remove bogus stopNest in configureW
* In setup.sh: add configureFlagsArray or something
* Inform freedesktop people that Xaw requires Xpm.

6
pkgs/development/libraries/gtk+/atk/default.nix
View File

@ -3,10 +3,10 @@
assert pkgconfig != null && glib != null && perl != null;
stdenv.mkDerivation {
name = "atk-1.2.4";
name = "atk-1.6.0";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2;
md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
url = ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.0.tar.bz2;
md5 = "5e699af22a934ea3c1c1ed3742da0500";
};
buildInputs = [pkgconfig perl];
propagatedBuildInputs = [glib];

6
pkgs/development/libraries/gtk+/glib/default.nix
View File

@ -3,10 +3,10 @@
assert pkgconfig != null && gettext != null && perl != null;
stdenv.mkDerivation {
name = "glib-2.2.3";
name = "glib-2.4.0";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2;
md5 = "aa214a10d873b68ddd67cd9de2ccae55";
url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.0.tar.bz2;
md5 = "0f5f4896782ec7ab6ea8c7c1d9958114";
};
buildInputs = [pkgconfig gettext perl];
}

6
pkgs/development/libraries/gtk+/gtk+/default.nix
View File

@ -10,10 +10,10 @@ assert x11.buildClientLibs;
#assert x11 == pango.x11;
stdenv.mkDerivation {
name = "gtk+-2.2.4";
name = "gtk+-2.4.0";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2;
md5 = "605332199533e73bc6eec481fb4f1671";
url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.0.tar.bz2;
md5 = "fd16157de447c7f0a86495ad0dc67a1b";
};
buildInputs = [pkgconfig perl libtiff libjpeg libpng];
propagatedBuildInputs = [x11 glib atk pango];

6
pkgs/development/libraries/gtk+/pango/default.nix
View File

@ -4,10 +4,10 @@ assert pkgconfig != null && x11 != null && glib != null;
assert x11.buildClientLibs;
stdenv.mkDerivation {
name = "pango-1.2.5";
name = "pango-1.4.0";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2;
md5 = "df00fe3e71cd297010f24f439b6c8ee6";
url = ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.0.tar.bz2;
md5 = "9b5d9a5dcce5b3899d401f9c2cd6873f";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [x11 glib];

26
pkgs/development/libraries/libjpeg/builder.sh
View File

@ -1,13 +1,15 @@
. $stdenv/setup || exit 1
. $stdenv/setup
tar xvfz $src || exit 1
cd jpeg-* || exit 1
./configure --prefix=$out --enable-shared || exit 1
make || exit 1
mkdir $out || exit 1
mkdir $out/bin || exit 1
mkdir $out/lib || exit 1
mkdir $out/include || exit 1
mkdir $out/man || exit 1
mkdir $out/man/man1 || exit 1
make install || exit 1
configureFlags="--enable-shared"
preInstall() {
mkdir $out
mkdir $out/bin
mkdir $out/lib
mkdir $out/include
mkdir $out/man
mkdir $out/man/man1
}
preInstall=preInstall
genericBuild

16
pkgs/development/libraries/libpng/builder.sh
View File

@ -1,15 +1,15 @@
buildInputs="$zlib"
. $stdenv/setup
tar xvfj $src
cd libpng-*
make -f scripts/makefile.linux
makeFlags="-f scripts/makefile.linux"
preInstall() {
mkdir $out
mkdir $out/bin
mkdir $out/lib
mkdir $out/include
make -f scripts/makefile.linux install prefix=$out
strip -S $out/lib/*.a
}
preInstall=preInstall
mkdir $out/nix-support
echo "$zlib" > $out/nix-support/propagated-build-inputs
installFlags="-f scripts/makefile.linux install prefix=$out"
genericBuild

3
pkgs/development/libraries/libpng/default.nix
View File

@ -9,5 +9,6 @@ stdenv.mkDerivation {
url = http://heanet.dl.sourceforge.net/sourceforge/png-mng/libpng-1.2.5.tar.bz2;
md5 = "3fc28af730f12ace49b14568de4ad934";
};
zlib = zlib;
propagatedBuildInputs = [zlib];
inherit zlib;
}

14
pkgs/development/libraries/libtiff/builder.sh
View File

@ -1,15 +1,5 @@
buildinputs="$zlib $libjpeg"
. $stdenv/setup
tar xvfz $src
cd tiff-*
./configure --prefix=$out --with-DIR_MAN=$out/man \
--with-ZIP --with-JPEG \
--with-DIRS_LIBINC="$zlib/include $libjpeg/include"
make
mkdir $out
make install
strip -S $out/lib/*.a
configureFlags="--with-DIR_MAN=$out/man --with-ZIP --with-JPEG"
mkdir $out/nix-support
echo "$zlib $libjpeg" > $out/nix-support/propagated-build-inputs
genericBuild

4
pkgs/development/libraries/libtiff/default.nix
View File

@ -9,6 +9,6 @@ stdenv.mkDerivation {
url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz;
md5 = "82243b5ae9b7c9e492aeebc501680990";
};
zlib = zlib;
libjpeg = libjpeg;
propagatedBuildInputs = [zlib libjpeg];
inherit zlib libjpeg;
}

15
pkgs/development/tools/misc/pkgconfig/builder.sh
View File

@ -1,11 +1,10 @@
. $stdenv/setup
tar xvfz $src
cd pkgconfig-*
./configure --prefix=$out
make
mkdir $out
make install
mkdir $out/nix-support
postInstall() {
test -x $out/nix-support || mkdir $out/nix-support
cp $setupHook $out/nix-support/setup-hook
}
postInstall=postInstall
genericBuild