diff options
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--[-rwxr-xr-x] | pkgs/tools/compression/bzip2/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/tools/compression/gzip/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 5 |
4 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index e2c5982852e6d..49028c0e5a1ea 100755..100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -1,4 +1,3 @@ -#! /bin/sh -e . $stdenv/setup installFlags="PREFIX=$out" genericBuild diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index af3ec46dec79b..afe2a620377e3 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "bzip2-1.0.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz; md5 = "ee76864958d568677f03db8afad92beb"; }; - inherit stdenv; } diff --git a/pkgs/tools/compression/gzip/builder.sh b/pkgs/tools/compression/gzip/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/compression/gzip/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index d766635b05b24..7e324fc91271e 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gzip-1.3.3"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = http://www.gzip.org/gzip-1.3.3.tar.gz; md5 = "52eaf713673507d21f7abefee98ba662"; }; - inherit stdenv; } |