diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-09 13:01:38 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-09 13:01:38 +0100 |
commit | 16e626a80dd98f10622c6004415efdf2658a298c (patch) | |
tree | f11b11fe598386438c3f0e234b72b39ae77f99d8 /pkgs | |
parent | 4775dee8b9bca7382240935e5cef219c28b8cf0b (diff) |
Replace lib/java -> share/java
Diffstat (limited to 'pkgs')
13 files changed, 71 insertions, 72 deletions
diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index b25d178d16486..89d908826b1ce 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -26,8 +26,8 @@ in mkdir -p "dist" cat > build.properties <<EOF dist.lisp.dir = dist/share/emacs/site-lisp - dist.java.lib.dir = dist/lib/java - dist.jar.jde.file = dist/lib/java/jde.jar + dist.java.lib.dir = dist/share/java + dist.jar.jde.file = dist/share/java/jde.jar dist.java.src.dir = dist/src/${name}/java dist.doc.dir dist/doc/${name} prefix.dir = $out @@ -40,7 +40,7 @@ in for i in "lisp/"*.el do sed -i "$i" -e "s|@out@|$out|g ; - s|@javadir@|$out/lib/java|g ; + s|@javadir@|$out/share/java|g ; s|@datadir@|$out/share/${name}|g" done ''; @@ -55,7 +55,7 @@ in # Move everything that's not a JAR to $datadir. This includes # `sun_checks.xml', license files, etc. - cd "$out/lib/java" + cd "$out/share/java" for i in * do if echo $i | grep -qv '\.jar''$' diff --git a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch b/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch index 53aa8edc6eaac..ec03749daa678 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch +++ b/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch @@ -14,7 +14,7 @@ Tell the elisp code about the right Java directory. - (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory)) - (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)) - (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory)) -+ (let ((jde-java-directory "@out@/lib/java")) ++ (let ((jde-java-directory "@out@/share/java")) + + (oset this bsh-cmd-dir "@datadir@/bsh-commands") + (oset this checkstyle-jar (expand-file-name "checkstyle-all.jar" jde-java-directory)) @@ -38,7 +38,7 @@ Tell the elisp code about the right Java directory. - (concat - (jde-find-jde-data-directory) - "java/")) -+ (jde-java-directory "@out@/lib/java") ++ (jde-java-directory "@out@/share/java") (args (append (unless jde-checkstyle-expanded-properties-file (jde-checkstyle-get-property-args this)) @@ -67,7 +67,7 @@ Tell the elisp code about the right Java directory. - (jde-java-directory - (expand-file-name "java" - (jde-find-jde-data-directory))) -+ (jde-java-directory "@out@/lib/java") ++ (jde-java-directory "@out@/share/java") (vm-args (let (args) (setq args diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 93d1b28854a67..4eefd5749b653 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [jre unzip]; buildPhase = ""; installPhase = '' - mkdir -p "$out"/{bin,lib/java/zvtm/plugins,share/doc/zvtm} + mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm} cp overview.html *.license.* "$out/share/doc/zvtm" - cp -r target/* "$out/lib/java/zvtm/" + cp -r target/* "$out/share/java/zvtm/" echo '#!/bin/sh' > "$out/bin/zgrviewer" - echo "java -jar '$out/lib/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer" + echo "java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; meta = { diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index c3ff7d100ccc0..1ca3c65d3f256 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation ( antSetupPhase = with stdenv.lib; '' if test "$hydraAntLogger" != "" ; then - export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/lib/java/*.jar | head -1`" + export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`" fi for abi in ${concatStringsSep " " (map (f: "`find ${f} -name '*.jar'`") antBuildInputs)}; do export ANT_ARGS="$ANT_ARGS -lib $abi" @@ -39,20 +39,20 @@ stdenv.mkDerivation ( ''; installPhase = '' - mkdir -p $out/lib/java + mkdir -p $out/share/java ${ if jars == [] then '' - find . -name "*.jar" | xargs -I{} cp -v {} $out/lib/java + find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java '' else stdenv.lib.concatMapStrings (j: '' - cp -v ${j} $out/lib/java + cp -v ${j} $out/share/java '') jars } - for j in $out/lib/java/*.jar ; do + for j in $out/share/java/*.jar ; do echo file jar $j >> $out/nix-support/hydra-build-products done ''; generateWrappersPhase = let - cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/*"}'"; + cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/share/java/*"}'"; in '' header "Generating jar wrappers" diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 13c9f1c035053..428346b78b6b6 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ gnutar ]; installPhase = '' - mkdir -p $out/lib/java $out/bin + mkdir -p $out/share/java $out/bin tar -xzf $src - cp -r compiler.jar $out/lib/java/ + cp -r compiler.jar $out/share/java/ echo "#!${bash}/bin/bash" > $out/bin/closure-compiler - echo "${jre}/bin/java -jar $out/lib/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler + echo "${jre}/bin/java -jar $out/share/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler chmod +x $out/bin/closure-compiler ''; diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index b39c1fd6209c7..c1e104458302c 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation { phases = "installPhase"; installPhase = '' - mkdir -p $out/lib/java - ln -s $jar $out/lib/java/clooj.jar - makeWrapper ${jre}/bin/java $out/bin/clooj --add-flags "-jar $out/lib/java/clooj.jar" + mkdir -p $out/share/java + ln -s $jar $out/share/java/clooj.jar + makeWrapper ${jre}/bin/java $out/bin/clooj --add-flags "-jar $out/share/java/clooj.jar" ''; meta = { diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 239dc1afa2a4d..adffa9c9666f0 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation { buildPhase = "ant jar"; installPhase = '' - mkdir -p $out/lib/java $out/bin/java - install -t $out/lib/java clojure.jar - makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/lib/java/clojure.jar clojure.main" + mkdir -p $out/share/java $out/bin/java + install -t $out/share/java clojure.jar + makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main" ''; meta = { diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 10d2b3d4b8fdf..c54c3f3a8ee8f 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildPhase = "mkdir lib; ant"; installPhase = '' - mkdir -p $out/lib/java - cp -v *.jar $out/lib/java + mkdir -p $out/share/java + cp -v *.jar $out/share/java ''; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index a61ea5e60452f..ec19e381281d0 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -9,48 +9,49 @@ let sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in - stdenv.mkDerivation { - name = "rhino-${version}"; - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip"; - sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7"; - }; +stdenv.mkDerivation { + name = "rhino-${version}"; - patches = [ ./gcj-type-mismatch.patch ]; + src = fetchurl { + url = "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip"; + sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7"; + }; - preConfigure = - '' find -name \*.jar -or -name \*.class -exec rm -v {} \; + patches = [ ./gcj-type-mismatch.patch ]; - # The build process tries to download it by itself. - mkdir -p "build/tmp-xbean" - ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" - ''; + preConfigure = + '' + find -name \*.jar -or -name \*.class -exec rm -v {} \; - buildInputs = [ unzip ant javac jvm ]; + # The build process tries to download it by itself. + mkdir -p "build/tmp-xbean" + ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" + ''; - buildPhase = "ant ${options} jar"; - doCheck = false; + buildInputs = [ unzip ant javac jvm ]; - # FIXME: Install javadoc as well. - installPhase = - '' mkdir -p "$out/lib/java" - cp -v *.jar "$out/lib/java" - ''; + buildPhase = "ant ${options} jar"; + doCheck = false; - meta = { - description = "Mozilla Rhino: JavaScript for Java"; + # FIXME: Install javadoc as well. + installPhase = + '' + mkdir -p "$out/share/java" + cp -v *.jar "$out/share/java" + ''; - longDescription = - '' Rhino is an open-source implementation of JavaScript written - entirely in Java. It is typically embedded into Java applications - to provide scripting to end users. - ''; + meta = { + description = "Mozilla Rhino: JavaScript for Java"; - homepage = http://www.mozilla.org/rhino/; + longDescription = + '' Rhino is an open-source implementation of JavaScript written + entirely in Java. It is typically embedded into Java applications + to provide scripting to end users. + ''; - licenses = [ "MPLv1.1" /* or */ "GPLv2+" ]; + homepage = http://www.mozilla.org/rhino/; - maintainers = [ ]; - }; - } + licenses = [ "MPLv1.1" /* or */ "GPLv2+" ]; + }; +} diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index 8d0924028cc8e..6a66466506cbb 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -1,16 +1,14 @@ #!/bin/bash -set -e - source $stdenv/setup -mkdir -pv $out/bin $out/lib +mkdir -pv $out/bin $out/share/java out_bin=$out/bin/lein cp -v $src $out_bin -cp -v $jarsrc $out/lib -cp -v $clojure/lib/java/* $out/lib +cp -v $jarsrc $out/share/java +cp -v $clojure/share/java/* $out/share/java/ for p in $patches; do diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch index 23f6b62477647..f7d5bc4d9a7ee 100644 --- a/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch +++ b/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch @@ -1,4 +1,4 @@ 46c47 < LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar --- -> LEIN_JAR=$(find $(dirname $0)/../lib -name *-standalone.jar | head -n 1) +> LEIN_JAR=$(find $(dirname $0)/../share/java -name *-standalone.jar | head -n 1) diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh index cdc5f94bde0c0..f95dafedd32a0 100644 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ b/pkgs/tools/misc/jdiskreport/builder.sh @@ -4,12 +4,12 @@ unzip $src jar=$(ls */*.jar) -mkdir -p $out/lib/java -mv $jar $out/lib/java +mkdir -p $out/share/java +mv $jar $out/share/java mkdir -p $out/bin cat > $out/bin/jdiskreport <<EOF #! $SHELL -e -exec $jre/bin/java -jar $out/lib/java/$(basename $jar) +exec $jre/bin/java -jar $out/share/java/$(basename $jar) EOF chmod +x $out/bin/jdiskreport diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index a12a40e8ed714..c7c389a3733f1 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -14,16 +14,16 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/smc" mkdir -p "$out/share/smc/lib" mkdir -p "$out/share/icons" - mkdir -p "$out/lib/java" + mkdir -p "$out/share/java" - cp bin/Smc.jar "$out/lib/java/" + cp bin/Smc.jar "$out/share/java/" cp -r examples/ docs/ tools/ README.txt LICENSE.txt "$out/share/smc/" cp -r lib/* "$out/share/smc/lib/" cp misc/smc.ico "$out/share/icons/" cat > "$out/bin/smc" << EOF #!${stdenv.shell} - ${jre}/bin/java -jar "$out/lib/java/Smc.jar" "\$@" + ${jre}/bin/java -jar "$out/share/java/Smc.jar" "\$@" EOF chmod a+x "$out/bin/smc" ''; |