diff options
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--[-rwxr-xr-x] | pkgs/development/interpreters/j2re/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/development/interpreters/j2re/default.nix | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/interpreters/perl/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/interpreters/python/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/default.nix | 5 |
6 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/interpreters/j2re/builder.sh b/pkgs/development/interpreters/j2re/builder.sh index 9e977f2a384e4..e14d911320b27 100755..100644 --- a/pkgs/development/interpreters/j2re/builder.sh +++ b/pkgs/development/interpreters/j2re/builder.sh @@ -1,4 +1,3 @@ -#!/bin/sh . $stdenv/setup || exit 1 version=j2re1.4.2_03 diff --git a/pkgs/development/interpreters/j2re/default.nix b/pkgs/development/interpreters/j2re/default.nix index 170ac1bed4db6..3fa417657eac8 100644 --- a/pkgs/development/interpreters/j2re/default.nix +++ b/pkgs/development/interpreters/j2re/default.nix @@ -3,7 +3,6 @@ if stdenv.system == "i686-linux" then (import ./j2re-sun-linux.nix) { - stdenv = stdenv; fetchurl = fetchurl; } else diff --git a/pkgs/development/interpreters/perl/builder.sh b/pkgs/development/interpreters/perl/builder.sh index e36e0738f501a..c1d35465d0b4d 100755..100644 --- a/pkgs/development/interpreters/perl/builder.sh +++ b/pkgs/development/interpreters/perl/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$patch" . $stdenv/setup diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 26f44b9ef81c3..da3d53abe5f61 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,8 +1,7 @@ {stdenv, fetchurl, patch}: -derivation { +stdenv.mkDerivation { name = "perl-5.8.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { @@ -19,5 +18,5 @@ derivation { srcPatch = ./patch; - inherit stdenv patch; + inherit patch; } diff --git a/pkgs/development/interpreters/python/builder.sh b/pkgs/development/interpreters/python/builder.sh index 9c57a580847f1..d7baadecdac8c 100755..100644 --- a/pkgs/development/interpreters/python/builder.sh +++ b/pkgs/development/interpreters/python/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="" if test -n "$zlibSupport"; then buildinputs="$zlib $buildinputs" diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 4d60896424e2c..e3e075dc0f151 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -2,14 +2,13 @@ assert zlibSupport -> zlib != null; -derivation { +stdenv.mkDerivation { name = "python-2.3.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.python.org/ftp/python/2.3.3/Python-2.3.3.tar.bz2; md5 = "70ada9f65742ab2c77a96bcd6dffd9b1"; }; zlib = if zlibSupport then zlib else null; - inherit stdenv zlibSupport; + inherit zlibSupport; } |