diff --git a/pkgs/ed/ed-build.sh b/pkgs/ed/ed-build.sh new file mode 100755 index 00000000000..ba63de01c95 --- /dev/null +++ b/pkgs/ed/ed-build.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd ed-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs/ed/ed.fix b/pkgs/ed/ed.fix new file mode 100644 index 00000000000..04d9f72c0c5 --- /dev/null +++ b/pkgs/ed/ed.fix @@ -0,0 +1,13 @@ +Package( + [ ("name", "ed-0.2") + + , ("build", Relative("ed/ed-build.sh")) + + , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"), + [ ("url", "ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz") + , ("md5", "ddd57463774cae9b50e70cd51221281b") + ])) + + , ("stdenv", IncludeFix("stdenv/stdenv.fix")) + ] +) diff --git a/pkgs/fontconfig/fontconfig-build.sh b/pkgs/fontconfig/fontconfig-build.sh index ec313d835e1..551197ad250 100755 --- a/pkgs/fontconfig/fontconfig-build.sh +++ b/pkgs/fontconfig/fontconfig-build.sh @@ -2,6 +2,7 @@ envpkgs="$freetype $expat" . $stdenv/setup || exit 1 +export PATH=$ed/bin:$PATH tar xvfz $src || exit 1 cd fcpackage*/fontconfig || exit 1 diff --git a/pkgs/fontconfig/fontconfig.fix b/pkgs/fontconfig/fontconfig.fix index e02537c3511..7c97332da3a 100644 --- a/pkgs/fontconfig/fontconfig.fix +++ b/pkgs/fontconfig/fontconfig.fix @@ -11,5 +11,6 @@ Package( , ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("freetype", IncludeFix("freetype/freetype.fix")) , ("expat", IncludeFix("expat/expat.fix")) + , ("ed", IncludeFix("ed/ed.fix")) ] )