diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index ee0d925b2316..de3c9de6bd66 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -5,8 +5,8 @@ assert pkgconfig != null && gtk != null && gnet != null && libxml2 != null && perl != null && pcre != null; -assert spellChecking -> gtkspell != null && gtk == gtkspell.gtk; -assert gtk.glib == gnet.glib; +assert spellChecking -> gtkspell != null /* !!! && gtk == gtkspell.gtk */; +# !!! assert gtk.glib == gnet.glib; stdenv.mkDerivation { name = "pan-0.14.2.91"; diff --git a/pkgs/development/libraries/gnet/builder.sh b/pkgs/development/libraries/gnet/builder.sh deleted file mode 100644 index 3590c5e23fb1..000000000000 --- a/pkgs/development/libraries/gnet/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index ae6aadd42b28..eb45224a527e 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -4,11 +4,9 @@ assert pkgconfig != null && glib != null; stdenv.mkDerivation { name = "gnet-2.0.4"; - builder = ./builder.sh; src = fetchurl { url = http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz; md5 = "b43e728391143214e2cfd0b835b6fd2a"; }; - pkgconfig = pkgconfig; - glib = glib; + buildInputs = [pkgconfig glib]; } diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh deleted file mode 100644 index da5a450ffb8e..000000000000 --- a/pkgs/development/libraries/libxml2/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8e218a4dd72b..b72673df1640 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -3,11 +3,10 @@ assert zlib != null; stdenv.mkDerivation { - name = "libxml2-2.6.7"; - builder = ./builder.sh; + name = "libxml2-2.6.8"; src = fetchurl { - url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.7.tar.bz2; - md5 = "bdbef92cbdc5b4bd0365313ba22b75ce"; + url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.8.tar.bz2; + md5 = "f8a0dc1983f67db388baa0f7c65d2b70"; }; - zlib = zlib; + propagatedBuildInputs = [zlib]; }