diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-28 21:17:56 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-28 21:17:56 +0000 |
| commit | 5862e56f260424a626226293abfeda771e5067a9 (patch) | |
| tree | ed4771cb84e580794f05cd684e6ec684b2218c60 /pkgs | |
| parent | 892b119c9d2c4e1bcf28a1adf24f7bd00b4a6626 (diff) | |
| download | nixlib-5862e56f260424a626226293abfeda771e5067a9.tar nixlib-5862e56f260424a626226293abfeda771e5067a9.tar.gz nixlib-5862e56f260424a626226293abfeda771e5067a9.tar.bz2 nixlib-5862e56f260424a626226293abfeda771e5067a9.tar.lz nixlib-5862e56f260424a626226293abfeda771e5067a9.tar.xz nixlib-5862e56f260424a626226293abfeda771e5067a9.tar.zst nixlib-5862e56f260424a626226293abfeda771e5067a9.zip | |
* For simple Autotools-style packages (such as the ATerm library), the
builder may now be omitted entirely; the function `mkDerivation' will then use a default build script. svn path=/nixpkgs/trunk/; revision=868
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/aterm/default.nix | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkgs/stdenv/nix-linux/default-builder.sh (renamed from pkgs/development/libraries/aterm/builder.sh) | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/nix-linux/default.nix | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/aterm/default.nix b/pkgs/development/libraries/aterm/default.nix index bac496ecebca..b096dd4af20d 100644 --- a/pkgs/development/libraries/aterm/default.nix +++ b/pkgs/development/libraries/aterm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "aterm-2.0.5"; - builder = ./builder.sh; + configureFlags = "--with-gcc"; src = fetchurl { url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.5.tar.gz; md5 = "68aefb0c10b2ab876b8d3c0b2d0cdb1b"; diff --git a/pkgs/development/libraries/aterm/builder.sh b/pkgs/stdenv/nix-linux/default-builder.sh index 77432d7ff5b6..9a297c67f6e8 100755..100644 --- a/pkgs/development/libraries/aterm/builder.sh +++ b/pkgs/stdenv/nix-linux/default-builder.sh @@ -1,3 +1,2 @@ . $stdenv/setup -configureFlags="--with-gcc" genericBuild diff --git a/pkgs/stdenv/nix-linux/default.nix b/pkgs/stdenv/nix-linux/default.nix index f7230ce1b298..9e9602d5e1f6 100644 --- a/pkgs/stdenv/nix-linux/default.nix +++ b/pkgs/stdenv/nix-linux/default.nix @@ -27,7 +27,7 @@ let { // { mkDerivation = attrs: derivation (attrs // { builder = pkgs.bash ~ /bin/sh; - args = ["-e" attrs.builder]; + args = ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)]; stdenv = body; system = body.system; }); |