about summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers/leiningen/lein.patch
blob: 2edf1370ff4b1d8775453df19567180e31134b2e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
--- lein-pkg	2012-02-28 15:26:40.000000000 -0800
+++ lein-pkg-nix	2012-02-28 17:17:02.000000000 -0800
@@ -71,30 +71,14 @@
 LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
 LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
 CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
 
 # apply context specific CLASSPATH entries
 if [ -f .lein-classpath ]; then
     CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
 fi
 
-SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \
-lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
-maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
-maven-repository-metadata plexus-container-default-alpha plexus-interpolation \
-plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
-xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \
-backport-util-concurrent" # NFI why that last one is necessary
-for JAR in $SHARE_JARS; do
-    CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
-done
-
-# Do not use installed leiningen jar during self-compilation
-if ! { [ "$1" = "compile" ] &&
-        grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
-            project.clj ;}; then
-    CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
-fi
+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"