license fix

Julien LepillerSun Nov 19 15:16:06+0100 2017

8415ce4

license fix

more/packages/java.scm

29222922 
           (lambda* (#:key inputs #:allow-other-keys)
29232923 
             (mkdir-p "jaxen-sources")
29242924 
             (with-directory-excursion "jaxen-sources"
2925-
               (system* "jar" "xf" (assoc-ref inputs "jaxen-sources")))
2925+
               (system* "jar" "xf" (assoc-ref inputs "java-jaxen-sources")))
29262926 
             (mkdir-p "src/main/java/org/jaxen/dom4j")
29272927 
             (copy-file "jaxen-sources/org/jaxen/dom4j/DocumentNavigator.java"
29282928 
                        "src/main/java/org/jaxen/dom4j/DocumentNavigator.java")

…

31993199 
             ;; TODO: there are more required files for windows in windows/
32003200 
             (with-directory-excursion "src/main/native-package/src"
32013201 
               (system* "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o"
3202-
                        (string-append "-I" (assoc-ref inputs "hawtjni") "/include")
3203-
                        (string-append "-I" (assoc-ref inputs "jdk") "/include/linux")
3202+
                        (string-append "-I" (assoc-ref inputs "java-hawtjni")
3203+
                                       "/include")
3204+
                        (string-append "-I" (assoc-ref inputs "jdk")
3205+
                                       "/include/linux")
32043206 
                        "-fPIC" "-O2")
32053207 
               (system* "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o"))
32063208 
             ;; TODO: detect one of linux{32,64}, freebsd{32,64}, osx, windows{32,64}

…

33033305 
    (synopsis "")
33043306 
    (description "")
33053307 
    (license (list license:gpl2
3306-
                   ;; actually CDDL 1.1
3307-
                   license:cddl1.0))))
3308+
                   license:cddl1.1))))
33083309 
33093310 
(define-public groovy
33103311 
  (package