about summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-09 13:01:38 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-09 13:01:38 +0100
commit16e626a80dd98f10622c6004415efdf2658a298c (patch)
treef11b11fe598386438c3f0e234b72b39ae77f99d8 /pkgs/tools/misc
parent4775dee8b9bca7382240935e5cef219c28b8cf0b (diff)
downloadnixlib-16e626a80dd98f10622c6004415efdf2658a298c.tar
nixlib-16e626a80dd98f10622c6004415efdf2658a298c.tar.gz
nixlib-16e626a80dd98f10622c6004415efdf2658a298c.tar.bz2
nixlib-16e626a80dd98f10622c6004415efdf2658a298c.tar.lz
nixlib-16e626a80dd98f10622c6004415efdf2658a298c.tar.xz
nixlib-16e626a80dd98f10622c6004415efdf2658a298c.tar.zst
nixlib-16e626a80dd98f10622c6004415efdf2658a298c.zip
Replace lib/java -> share/java
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/jdiskreport/builder.sh6
-rw-r--r--pkgs/tools/misc/smc/default.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh
index cdc5f94bde0c..f95dafedd32a 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 a12a40e8ed71..c7c389a3733f 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"
   '';