From c43dbd671e8a30062f37f2a229c63bb4dbbd8fb9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 1 May 2010 07:07:25 +0000 Subject: [PATCH] Migrate wtk to new "restricted downloads" feature of fetchurl svn path=/nixpkgs/trunk/; revision=21472 --- pkgs/development/libraries/wtk/builder.sh | 17 +---------------- pkgs/development/libraries/wtk/default.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index bf65b96c7ca..5ccfc1a7391 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,23 +1,8 @@ source $stdenv/setup -if ! test -e "$pathname"; then - echo "" - echo "SORRY!" - echo "You should download \`$(basename $pathname)' from Sun and place it in $(dirname $pathname)." - echo "Blame Sun, not us." - echo "" - exit 1 -fi - -actual=$(md5sum -b $pathname | cut -c1-32) -if test "$actual" != "$md5"; then - echo "hash is $actual, expected $md5" - exit 1 -fi - mkdir unzipped pushd unzipped -unzip $pathname || true +unzip $src || true popd ensureDir $out diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 123d0a9216a..99e8613c6cb 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -2,11 +2,15 @@ assert stdenv.system == "i686-linux"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "sun-java-wtk-2.5.2_01"; - pathname = "/tmp/sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh"; - md5 = "6b70b6e6d426eac121db8a087991589f"; + src = fetchurl { + url = meta.homepage; + name = "sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh"; + restricted = true; + md5 = "6b70b6e6d426eac121db8a087991589f"; + }; builder = ./builder.sh;