movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

* Some more updates.

Browse source 
svn path=/nixpkgs/trunk/; revision=884
This commit is contained in:
Eelco Dolstra 2004-03-30 17:42:45 +00:00
parent 00004fa6da
commit 24cb251dd0
5 changed files with 7 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/newsreaders/pan/default.nix
View file

@ -5,8 +5,8 @@
assert pkgconfig != null && gtk != null && gnet != null assert pkgconfig != null && gtk != null && gnet != null
&& libxml2 != null && perl != null && pcre != null; && libxml2 != null && perl != null && pcre != null;
assert spellChecking -> gtkspell != null && gtk == gtkspell.gtk; assert spellChecking -> gtkspell != null /* !!! && gtk == gtkspell.gtk */;
assert gtk.glib == gnet.glib; # !!! assert gtk.glib == gnet.glib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pan-0.14.2.91"; name = "pan-0.14.2.91";

8
pkgs/development/libraries/gnet/builder.sh
View file

@ -1,8 +0,0 @@
buildinputs="$pkgconfig $glib"
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd gnet-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1

4
pkgs/development/libraries/gnet/default.nix
View file

@ -4,11 +4,9 @@ assert pkgconfig != null && glib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnet-2.0.4"; name = "gnet-2.0.4";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz; url = http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz;
md5 = "b43e728391143214e2cfd0b835b6fd2a"; md5 = "b43e728391143214e2cfd0b835b6fd2a";
}; };
pkgconfig = pkgconfig; buildInputs = [pkgconfig glib];
glib = glib;
} }

12
pkgs/development/libraries/libxml2/builder.sh
View file

@ -1,12 +0,0 @@
buildinputs="$zlib"
. $stdenv/setup
tar xvfj $src
cd libxml2-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$zlib" > $out/nix-support/propagated-build-inputs

9
pkgs/development/libraries/libxml2/default.nix
View file

@ -3,11 +3,10 @@
assert zlib != null; assert zlib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxml2-2.6.7"; name = "libxml2-2.6.8";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.7.tar.bz2; url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.8.tar.bz2;
md5 = "bdbef92cbdc5b4bd0365313ba22b75ce"; md5 = "f8a0dc1983f67db388baa0f7c65d2b70";
}; };
zlib = zlib; propagatedBuildInputs = [zlib];
} }