diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-28 18:19:42 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-28 18:31:17 +0100 |
commit | f7cc884de4437612e1658aaabd3de2cb4a00ca54 (patch) | |
tree | b67066f2715131a04d425d7e22a4abec697feeb4 /pkgs/development/compilers | |
parent | 6930efd1e592c9cc2915863f0a7122da8362f083 (diff) | |
download | nixlib-f7cc884de4437612e1658aaabd3de2cb4a00ca54.tar nixlib-f7cc884de4437612e1658aaabd3de2cb4a00ca54.tar.gz nixlib-f7cc884de4437612e1658aaabd3de2cb4a00ca54.tar.bz2 nixlib-f7cc884de4437612e1658aaabd3de2cb4a00ca54.tar.lz nixlib-f7cc884de4437612e1658aaabd3de2cb4a00ca54.tar.xz nixlib-f7cc884de4437612e1658aaabd3de2cb4a00ca54.tar.zst nixlib-f7cc884de4437612e1658aaabd3de2cb4a00ca54.zip |
gwt: Remove obsolete version
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/gwt/2.4.0.nix | 14 | ||||
-rw-r--r-- | pkgs/development/compilers/gwt/builder.sh | 31 | ||||
-rw-r--r-- | pkgs/development/compilers/gwt/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/compilers/opencxx/default.nix | 2 |
4 files changed, 9 insertions, 52 deletions
diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 000b57946f69..c5c7841d72a0 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "gwt-java-2.4.0"; - src = fetchurl { - url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; - sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; + + src = fetchurl { + url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; + sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; }; - buildInputs = [unzip]; + + buildInputs = [ unzip ]; installPhase = '' ensureDir $out @@ -18,4 +20,4 @@ stdenv.mkDerivation { homepage = http://code.google.com/webtoolkit/; description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications."; }; - } +} diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh deleted file mode 100644 index b14a0432ea58..000000000000 --- a/pkgs/development/compilers/gwt/builder.sh +++ /dev/null @@ -1,31 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -mkdir -p $out -cp -av $name $out - -# Create wrapper scripts so that the GWT compiler/host work - -libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12" - -mkdir -p $out/bin - -cat > $out/bin/gwt-compile <<EOF -#!/bin/sh - -export LD_LIBRARY_PATH=$libPath -export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation - -$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.Compiler \$@ -EOF -chmod 755 $out/bin/gwt-compile - -cat > $out/bin/gwt-shell <<EOF -#!/bin/sh - -export LD_LIBRARY_PATH=$libPath -export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation - -$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@ -EOF -chmod 755 $out/bin/gwt-shell diff --git a/pkgs/development/compilers/gwt/default.nix b/pkgs/development/compilers/gwt/default.nix deleted file mode 100644 index f22996a6a670..000000000000 --- a/pkgs/development/compilers/gwt/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5, jdk}: - -stdenv.mkDerivation { - name = "gwt-linux-1.7.1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2; - sha256 = "0lgirr9lr0qsfvw61hqzracdllqklb4qkzbk5x3lc4r64mms5b3g"; - }; - - inherit glib gtk pango atk libX11 libXt libstdcpp5 jdk; - buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5]; -} diff --git a/pkgs/development/compilers/opencxx/default.nix b/pkgs/development/compilers/opencxx/default.nix index cf000cd3ea58..54eda51353f9 100644 --- a/pkgs/development/compilers/opencxx/default.nix +++ b/pkgs/development/compilers/opencxx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libtool, gcc, patches ? []}: +{ stdenv, fetchurl, libtool, gcc, patches ? []}: stdenv.mkDerivation { name = "opencxx-2.8"; |