diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-19 16:53:04 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-19 16:53:04 +0000 |
commit | 5941f66f0e76cadbda30b3240ba00b30ea365ac7 (patch) | |
tree | 35ecc8fde93aa1dd9b5705fe5302cae77ead3860 /pkgs/tools/archivers/unzip | |
parent | 0fd59fd7a41a47478f241b4a27c39d39f42914b9 (diff) | |
download | nixpkgs-5941f66f0e76cadbda30b3240ba00b30ea365ac7.tar nixpkgs-5941f66f0e76cadbda30b3240ba00b30ea365ac7.tar.gz nixpkgs-5941f66f0e76cadbda30b3240ba00b30ea365ac7.tar.bz2 nixpkgs-5941f66f0e76cadbda30b3240ba00b30ea365ac7.tar.lz nixpkgs-5941f66f0e76cadbda30b3240ba00b30ea365ac7.tar.xz nixpkgs-5941f66f0e76cadbda30b3240ba00b30ea365ac7.tar.zst nixpkgs-5941f66f0e76cadbda30b3240ba00b30ea365ac7.zip |
* The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g., . $stdenv/setup genericBuild The generic builder does lots of stuff automatically: - Unpacks source archives specified by $src or $srcs (it knows about gzip, bzip2, tar, zip, and unpacked source trees). - Determines the source tree. - Applies patches specified by $patches. - Fixes libtool not to search for libraries in /lib etc. - Runs `configure'. - Runs `make'. - Runs `make install'. - Strips debug information from static libraries. - Writes nested log information (in the format accepted by `log2xml'). There are also lots of hooks and variables to customise the generic builder. See `stdenv/generic/docs.txt'. * Adapted the base packages (i.e., the ones used by stdenv) to use the generic builder. * We now use `curl' instead of `wget' to download files in `fetchurl'. * Neither `curl' nor `wget' are part of stdenv. We shouldn't encourage people to download stuff in builders (impure!). * Updated some packages. * `buildinputs' is now `buildInputs' (but the old name also works). * `findInputs' in the setup script now prevents inputs from being processed multiple times (which could happen, e.g., if an input was a propagated input of several other inputs; this caused the size variables like $PATH to blow up exponentially in the worst case). * Patched GNU Make to write nested log information in the format accepted by `log2xml'. Also, prior to writing the build command, Make now writes a line `building X' to indicate what is being built. This is unfortunately often obscured by the gigantic tool invocations in many Makefiles. The actual build commands are marked `unimportant' so that they don't clutter pages generated by `log2html'. svn path=/nixpkgs/trunk/; revision=845
Diffstat (limited to 'pkgs/tools/archivers/unzip')
-rwxr-xr-x | pkgs/tools/archivers/unzip/builder.sh | 20 | ||||
-rw-r--r-- | pkgs/tools/archivers/unzip/default.nix | 6 |
2 files changed, 18 insertions, 8 deletions
diff --git a/pkgs/tools/archivers/unzip/builder.sh b/pkgs/tools/archivers/unzip/builder.sh index 90613620c7b..f0b9d031802 100755 --- a/pkgs/tools/archivers/unzip/builder.sh +++ b/pkgs/tools/archivers/unzip/builder.sh @@ -1,8 +1,16 @@ -#! /bin/sh +#! /bin/sh -e -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfz $src || exit 1 -cd unzip-* || exit 1 -make -f unix/Makefile generic || exit 1 -make -f unix/Makefile prefix=$out install || exit 1 +builder() { + make -f unix/Makefile generic +} + +installer() { + make -f unix/Makefile prefix=$out install +} + +buildPhase=builder +installPhase=installer + +genericBuild diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index b9904ea8646..8467e00d029 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: + +derivation { name = "unzip-5.50"; system = stdenv.system; builder = ./builder.sh; @@ -6,5 +8,5 @@ url = ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz; md5 = "798592d62e37f92571184236947122ed"; }; - stdenv = stdenv; + inherit stdenv; } |