diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2004-05-12 15:48:39 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2004-05-12 15:48:39 +0000 |
| commit | b410599fc4b2c6b1a89d26672e26b083afc9002d (patch) | |
| tree | 61b7c66bd674bb0b4783100ce0f2ac7d82a6efa7 /pkgs/development/tools/parsing | |
| parent | 9ba11d2be68130c5e082a8d6df2e75d700d2c3b3 (diff) | |
| download | nixpkgs-b410599fc4b2c6b1a89d26672e26b083afc9002d.tar nixpkgs-b410599fc4b2c6b1a89d26672e26b083afc9002d.tar.gz nixpkgs-b410599fc4b2c6b1a89d26672e26b083afc9002d.tar.bz2 nixpkgs-b410599fc4b2c6b1a89d26672e26b083afc9002d.tar.lz nixpkgs-b410599fc4b2c6b1a89d26672e26b083afc9002d.tar.xz nixpkgs-b410599fc4b2c6b1a89d26672e26b083afc9002d.tar.zst nixpkgs-b410599fc4b2c6b1a89d26672e26b083afc9002d.zip | |
More upgrades
svn path=/nixpkgs/trunk/; revision=1016
Diffstat (limited to 'pkgs/development/tools/parsing')
4 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/tools/parsing/pt-support/builder.sh b/pkgs/development/tools/parsing/pt-support/builder.sh index 9c03520e9a2..4f5f8ffcb3d 100644 --- a/pkgs/development/tools/parsing/pt-support/builder.sh +++ b/pkgs/development/tools/parsing/pt-support/builder.sh @@ -1,7 +1,3 @@ -buildinputs="$aterm $toolbuslib" -. $stdenv/setup || exit 1 - -tar zxf $src || exit 1 -cd pt-support-* || exit 1 -./configure --prefix=$out --with-aterm=$aterm --with-toolbuslib=$toolbuslib || exit 1 -make install || exit 1 +. $stdenv/setup +configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib" +genericBuild diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix index 66ca31566da..ed8bde95c0e 100644 --- a/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix +++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.0.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, aterm, toolbuslib}: derivation { +{stdenv, fetchurl, aterm, toolbuslib}: + +stdenv.mkDerivation { name = "pt-support-1.0"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.0.tar.gz; md5 = "cc96dc2bfbaf3f218dfe9a0b8bb4d801"; }; - stdenv = stdenv; - aterm = aterm; - toolbuslib = toolbuslib; + inherit aterm toolbuslib; + buildInputs = [aterm toolbuslib]; } diff --git a/pkgs/development/tools/parsing/toolbuslib/builder.sh b/pkgs/development/tools/parsing/toolbuslib/builder.sh deleted file mode 100644 index 7c28663f38c..00000000000 --- a/pkgs/development/tools/parsing/toolbuslib/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -. $stdenv/setup -configureFlags="--with-aterm=$aterm" -genericBuild diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix index a494799587a..4b93aa24baf 100644 --- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix +++ b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation { name = "toolbuslib-0.5.1"; - builder = ./builder.sh; src = fetchurl { url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.5.1.tar.gz; md5 = "1c7c7cce870f813bef60bbffdf061c90"; |