diff options
Diffstat (limited to 'pkgs/os-specific/linux/util-linux')
-rw-r--r--[-rwxr-xr-x] | pkgs/os-specific/linux/util-linux/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/util-linux/builder.sh b/pkgs/os-specific/linux/util-linux/builder.sh index d60064c8b7fe6..16f015c73a9ac 100755..100644 --- a/pkgs/os-specific/linux/util-linux/builder.sh +++ b/pkgs/os-specific/linux/util-linux/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$patch" . $stdenv/setup diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 86f95f2588afd..a346d134c8045 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, patch}: -derivation { +stdenv.mkDerivation { name = "util-linux-2.12"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.cwi.nl/aeb/util-linux/util-linux-2.12.tar.gz; md5 = "997adf78b98d9d1c5db4f37ea982acff"; }; mconfigPatch = ./MCONFIG.patch; - inherit stdenv patch; + inherit patch; } |