diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--[-rwxr-xr-x] | pkgs/os-specific/linux/alsa/library/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/alsa/library/default.nix | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/os-specific/linux/e2fsprogs/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/e2fsprogs/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/os-specific/linux/kernel-headers/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/os-specific/linux/net-tools/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/net-tools/default.nix | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/os-specific/linux/sysvinit/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sysvinit/default.nix | 5 | ||||
-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 |
12 files changed, 9 insertions, 30 deletions
diff --git a/pkgs/os-specific/linux/alsa/library/builder.sh b/pkgs/os-specific/linux/alsa/library/builder.sh index 4cb8210f18638..eabae65a3c8dc 100755..100644 --- a/pkgs/os-specific/linux/alsa/library/builder.sh +++ b/pkgs/os-specific/linux/alsa/library/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfj $src || exit 1 diff --git a/pkgs/os-specific/linux/alsa/library/default.nix b/pkgs/os-specific/linux/alsa/library/default.nix index f13ca6ec54eff..02e3b1d49c730 100644 --- a/pkgs/os-specific/linux/alsa/library/default.nix +++ b/pkgs/os-specific/linux/alsa/library/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "alsa-lib-0.9.8"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-0.9.8.tar.bz2; md5 = "c9f163fb0623de1b92bf287712641f6e"; }; - stdenv = stdenv; } diff --git a/pkgs/os-specific/linux/e2fsprogs/builder.sh b/pkgs/os-specific/linux/e2fsprogs/builder.sh index 1f782ea310d1f..bb285c8a89b38 100755..100644 --- a/pkgs/os-specific/linux/e2fsprogs/builder.sh +++ b/pkgs/os-specific/linux/e2fsprogs/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$gettext" . $stdenv/setup diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix index afd32ed973762..9d4e6f24734a5 100644 --- a/pkgs/os-specific/linux/e2fsprogs/default.nix +++ b/pkgs/os-specific/linux/e2fsprogs/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, gettext}: -derivation { +stdenv.mkDerivation { name = "e2fsprogs-1.34"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://heanet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.34.tar.gz; md5 = "9be9375224f0970a55e39ebebf2a0ce5"; }; - inherit stdenv gettext; + inherit gettext; } diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh index 957a2552c87f1..823b21ae4114f 100755..100644 --- a/pkgs/os-specific/linux/kernel-headers/builder.sh +++ b/pkgs/os-specific/linux/kernel-headers/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index e16b4c6b19b1a..40ebac6c19213 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -2,13 +2,11 @@ assert stdenv.system == "i686-linux"; -derivation { +stdenv.mkDerivation { name = "linux-headers-2.4.25-i386"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2; md5 = "5fc8e9f43fa44ac29ddf9a9980af57d8"; }; - inherit stdenv; } diff --git a/pkgs/os-specific/linux/net-tools/builder.sh b/pkgs/os-specific/linux/net-tools/builder.sh index 87bb493c27f0d..17dea5297f6af 100755..100644 --- a/pkgs/os-specific/linux/net-tools/builder.sh +++ b/pkgs/os-specific/linux/net-tools/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="" . $stdenv/setup diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index fd6398c7184b1..d93870c1b255a 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "net-tools-1.60"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2; md5 = "888774accab40217dde927e21979c165"; }; config = ./config.h; - inherit stdenv; } diff --git a/pkgs/os-specific/linux/sysvinit/builder.sh b/pkgs/os-specific/linux/sysvinit/builder.sh index b67f28b6a992b..ed32068532b03 100755..100644 --- a/pkgs/os-specific/linux/sysvinit/builder.sh +++ b/pkgs/os-specific/linux/sysvinit/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$patch" . $stdenv/setup diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index da197f6422b1d..f9bbc3bedbfc4 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, patch}: -derivation { +stdenv.mkDerivation { name = "sysvinit-2.85"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz; md5 = "8a2d8f1ed5a2909da04132fefa44905e"; }; srcPatch = ./patch; - inherit stdenv patch; + inherit patch; } 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; } |