diff --git a/pkgs/getopt/getopt-build.sh b/pkgs/getopt/getopt-build.sh new file mode 100755 index 00000000000..30ac6e3d453 --- /dev/null +++ b/pkgs/getopt/getopt-build.sh @@ -0,0 +1,8 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd getopt-* || exit 1 +make || exit 1 +make install prefix=$out || exit 1 diff --git a/pkgs/getopt/getopt.fix b/pkgs/getopt/getopt.fix new file mode 100644 index 00000000000..ffe1979b278 --- /dev/null +++ b/pkgs/getopt/getopt.fix @@ -0,0 +1,14 @@ +Package( + [ ("name", "getopt-1.1.3") + + , ("build", Relative("getopt/getopt-build.sh")) + + , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"), + [ ("url", "http://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz`") + , ("md5", "7b7637dcb0ac531f1af29f4d6b018e86") + ])) + + , ("stdenv", IncludeFix("stdenv/stdenv.fix")) + ] +) + diff --git a/pkgs/sdf2/sdf2-build.sh b/pkgs/sdf2/sdf2-build.sh index f9a69962d52..07dc26a3bda 100755 --- a/pkgs/sdf2/sdf2-build.sh +++ b/pkgs/sdf2/sdf2-build.sh @@ -7,3 +7,10 @@ cd sdf2-* || exit 1 ./configure --prefix=$out --with-aterm=$aterm || exit 1 make || exit 1 make install || exit 1 + +# Replace the call to getopt in sdf2table with an absolute path (so that the +# users of sdf2table don't have to explicitly declare getopt as an input). +sdf2table=$out/bin/sdf2table +sed s^getopt^$getopt/bin/getopt^ < $sdf2table > $sdf2table.tmp || exit 1 +mv $sdf2table.tmp $sdf2table || exit 1 +chmod +x $sdf2table || exit 1 diff --git a/pkgs/sdf2/sdf2.fix b/pkgs/sdf2/sdf2.fix index 0248942dcab..1a0f00f7042 100644 --- a/pkgs/sdf2/sdf2.fix +++ b/pkgs/sdf2/sdf2.fix @@ -10,5 +10,6 @@ Package( , ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("aterm", IncludeFix("aterm/aterm.fix")) + , ("getopt", IncludeFix("getopt/getopt.fix")) ] )