From d62d2eea35c92fba74277ccc335bdf6deaa0382f Mon Sep 17 00:00:00 2001 From: Tobias Hammerschmidt Date: Fri, 11 Apr 2008 22:13:51 +0000 Subject: [PATCH] doh! svn path=/nixpkgs/trunk/; revision=11595 --- pkgs/development/compilers/jdk/default.nix | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/jdk/default.nix b/pkgs/development/compilers/jdk/default.nix index 6de5faa6026..c27ce4d1640 100644 --- a/pkgs/development/compilers/jdk/default.nix +++ b/pkgs/development/compilers/jdk/default.nix @@ -1,22 +1,9 @@ -args: with args; +args: -stdenv.mkDerivation rec { - name = "scala-2.7.0-final"; +if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then + (import ./jdk6-linux.nix) args +else if args.stdenv.system == "powerpc-linux" then + (import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["libstdcpp5" "pluginSupport" "xlibs" "installjdk"]) +else + abort "the JDK is not supported on this platform" - src = fetchurl { - url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tar.bz2"; - sha256 = "17b9711bfddac611e907659cab4cb51f4114b886bbee243274d774b691dae248"; - }; - - installPhase = '' - mkdir -p $out - mv * $out - rm -f $out/bin/*.bat - ''; - - phases = "unpackPhase installPhase"; - - meta = { - description = "Scala is a general purpose programming language"; - }; -}