commit c82410eeda78deb3afe898168700772d53361985 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/monitoring/riemann.nix

···

       17
       17
        
       

     

       18
       18
        
         launcher = writeScriptBin "riemann" ''

     

       19
       19
        
           #!/bin/sh

     

       20
       20
       -
           exec ${openjdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \

     

       20
       20
       +
           exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \

     

       21
       21
        
             -cp ${classpath} \

     

       22
       22
        
             riemann.bin ${writeText "riemann-config.clj" riemannConfig}

     

       23
       23
        
         '';

+1 -1

nixos/modules/services/search/solr.nix

···

       22
       22
        
             cp common/lib/*.jar $out/lib/

     

       23
       23
        
             ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/

     

       24
       24
        
             ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/

     

       25
       25
       -
             ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/

     

       25
       25
       +
             ln -s ${pkgs.jdk.home}/lib/tools.jar $out/lib/

     

       26
       26
        
           '' + optionalString (cfg.extraJars != []) ''

     

       27
       27
        
             for f in ${concatStringsSep " " cfg.extraJars}; do

     

       28
       28
        
                cp $f $out/lib

+1 -1

nixos/release-small.nix

···

       61
       61
        
             gettext

     

       62
       62
        
             git

     

       63
       63
        
             imagemagick

     

       64
       64
       +
             jdk

     

       64
       65
        
             linux

     

       65
       66
        
             mysql51

     

       66
       67
        
             mysql55

     

       67
       68
        
             nginx

     

       68
       69
        
             nodejs

     

       69
       69
       -
             openjdk

     

       70
       70
        
             openssh

     

       71
       71
        
             php

     

       72
       72
        
             postgresql92

+1 -3

pkgs/applications/editors/idea/default.nix

···

       70
       70
        
             cp -va . "$out/$name"

     

       71
       71
        
             ln -s "$out/$name/bin/${loName}.png" "$out/share/pixmaps/"

     

       72
       72
        
       

     

       73
       73
       -
             [ -d ${jdk}/lib/openjdk ] \

     

       74
       74
       -
               && jdk=${jdk}/lib/openjdk \

     

       75
       75
       -
               || jdk=${jdk}

     

       73
       73
       +
             jdk=${jdk.home}

     

       76
       74
        
       

     

       77
       75
        
             makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \

     

       78
       76
        
               --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \

+1 -1

pkgs/applications/editors/jedit/default.nix

···

       50
       50
        
           patch package-files/linux/jedit << EOF

     

       51
       51
        
           5a6,8

     

       52
       52
        
           > # specify the correct JAVA_HOME

     

       53
       53
       -
           > JAVA_HOME=${jdk.jre}/lib/openjdk/jre

     

       53
       53
       +
           > JAVA_HOME=${jdk.jre.home}/jre

     

       54
       54
        
           > 

     

       55
       55
        
           EOF

     

       56
       56
        
           sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit

+2 -2

pkgs/applications/editors/netbeans/default.nix

···

       26
       26
        
           mkdir -p $out/bin

     

       27
       27
        
           makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \

     

       28
       28
        
             --prefix PATH : ${jdk}/bin:${which}/bin \

     

       29
       29
       -
             --prefix JAVA_HOME : ${jdk}/lib/openjdk \

     

       30
       30
       -
             --add-flags "--jdkhome ${jdk}/lib/openjdk"

     

       29
       29
       +
             --prefix JAVA_HOME : ${jdk.home} \

     

       30
       30
       +
             --add-flags "--jdkhome ${jdk.home}"

     

       31
       31
        
             

     

       32
       32
        
           # Create desktop item, so we can pick it from the KDE/GNOME menu

     

       33
       33
        
           mkdir -p $out/share/applications

+2 -2

pkgs/applications/networking/remote/ssvnc/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu

     

       1
       1
       +
       { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu

     

       2
       2
        
       , libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       10
       10
        
           sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ imake zlib openjdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];

     

       13
       13
       +
         buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];

     

       14
       14
        
       

     

       15
       15
        
         configurePhase = "makeFlags=PREFIX=$out";

     

       16
       16

+1 -1

pkgs/applications/office/libreoffice/default.nix

···

       213
       213
        
           "--disable-postgresql-sdbc"

     

       214
       214
        
           "--with-package-format=native"

     

       215
       215
        
           "--enable-epm"

     

       216
       216
       -
           "--with-jdk-home=${jdk}/lib/openjdk"

     

       216
       216
       +
           "--with-jdk-home=${jdk.home}"

     

       217
       217
        
           "--with-ant-home=${ant}/lib/ant"

     

       218
       218
        
           "--without-fonts"

     

       219
       219
        
           "--without-myspell-dicts"

+1 -3

pkgs/applications/version-management/smartgithg/default.nix

···

       44
       44
        
           # unpacking should have produced a dir named 'smartgit'

     

       45
       45
        
           cp -a smartgit/* ${pkg_path}

     

       46
       46
        
           mkdir -pv ${bin_path}

     

       47
       47
       -
           [ -d ${jre}/lib/openjdk ] \

     

       48
       48
       -
             && jre=${jre}/lib/openjdk \

     

       49
       49
       -
             || jre=${jre}

     

       47
       47
       +
           jre=${jre.home}

     

       50
       48
        
           makeWrapper ${pkg_path}/bin/smartgit.sh ${bin_path}/smartgit \

     

       51
       49
        
             --prefix PATH : ${runtime_paths} \

     

       52
       50
        
             --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \

+1 -1

pkgs/build-support/release/ant-build.nix

···

       9
       9
        
       , antBuildInputs ? []

     

       10
       10
        
       , buildfile ? "build.xml"

     

       11
       11
        
       , ant ? pkgs.ant

     

       12
       12
       -
       , jre ? pkgs.openjdk

     

       12
       12
       +
       , jre ? pkgs.jdk

     

       13
       13
        
       , hydraAntLogger ? pkgs.hydraAntLogger

     

       14
       14
        
       , zip ? pkgs.zip

     

       15
       15
        
       , unzip ? pkgs.unzip

+3 -3

pkgs/development/compilers/aldor/default.nix

···

       1
       1
        
       { fetchgit, stdenv, gmp, which, flex, bison, makeWrapper

     

       2
       2
       -
       , autoconf, automake, libtool, openjdk, perl }:

     

       2
       2
       +
       , autoconf, automake, libtool, jdk, perl }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         name = "aldor-1.2.0";

     
···

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool

     

       14
       14
       -
                         openjdk perl ];

     

       14
       14
       +
                         jdk perl ];

     

       15
       15
        
       

     

       16
       16
        
         preConfigure = ''

     

       17
       17
        
           cd aldor ;

     
···

       22
       22
        
           for prog in aldor unicl javagen ;

     

       23
       23
        
           do

     

       24
       24
        
             wrapProgram $out/bin/$prog --set ALDORROOT $out \

     

       25
       25
       -
               --prefix PATH : ${openjdk}/bin \

     

       25
       25
       +
               --prefix PATH : ${jdk}/bin \

     

       26
       26
        
               --prefix PATH : ${stdenv.cc}/bin ;

     

       27
       27
        
           done

     

       28
       28
        
         '';

+2 -2

pkgs/development/interpreters/octave/default.nix

···

       2
       2
        
       , libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk

     

       3
       3
        
       , fftw, fftwSinglePrec, zlib, curl, qrupdate

     

       4
       4
        
       , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null

     

       5
       5
       -
       , suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null

     

       5
       5
       +
       , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     
···

       23
       23
        
           ++ (stdenv.lib.optional (hdf5 != null) hdf5)

     

       24
       24
        
           ++ (stdenv.lib.optional (glpk != null) glpk)

     

       25
       25
        
           ++ (stdenv.lib.optional (suitesparse != null) suitesparse)

     

       26
       26
       -
           ++ (stdenv.lib.optional (openjdk != null) openjdk)

     

       26
       26
       +
           ++ (stdenv.lib.optional (jdk != null) jdk)

     

       27
       27
        
           ++ (stdenv.lib.optional (gnuplot != null) gnuplot)

     

       28
       28
        
           ++ (stdenv.lib.optional (python != null) python)

     

       29
       29
        
           ;

+3 -3

pkgs/development/libraries/portmidi/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, unzip, cmake, /*openjdk,*/ alsaLib }:

     

       1
       1
       +
       { stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "portmidi-${version}";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         cmakeFlags = let

     

       13
       13
       -
           #base = "${openjdk}/jre/lib/${openjdk.architecture}";

     

       13
       13
       +
           #base = "${jdk}/jre/lib/${jdk.architecture}";

     

       14
       14
        
         in [

     

       15
       15
        
           "-DPORTMIDI_ENABLE_JAVA=0"

     

       16
       16
        
           /* TODO: Fix Java support.

     
···

       44
       44
        
           ln -s libportmidi.so "$out/lib/libporttime.so"

     

       45
       45
        
         '';

     

       46
       46
        
       

     

       47
       47
       -
         buildInputs = [ unzip cmake /*openjdk*/ alsaLib ];

     

       47
       47
       +
         buildInputs = [ unzip cmake /*jdk*/ alsaLib ];

     

       48
       48
        
       

     

       49
       49
        
         meta = {

     

       50
       50
        
           homepage = "http://portmedia.sourceforge.net/portmidi/";

+1 -1

pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix

···

       64
       64
        
           import os, sys

     

       65
       65
        
           

     

       66
       66
        
           os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'

     

       67
       67
       -
           os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'

     

       67
       67
       +
           os.environ['JAVA_HOME'] = '${jdk.home}'

     

       68
       68
        
           

     

       69
       69
        
           os.execv('$(pwd)/.builder.py', sys.argv)

     

       70
       70
        
           EOF

+1 -1

pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix

···

       61
       61
        
           import os, sys

     

       62
       62
        
           

     

       63
       63
        
           os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'

     

       64
       64
       -
           os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'

     

       64
       64
       +
           os.environ['JAVA_HOME'] = '${jdk.home}'

     

       65
       65
        
           

     

       66
       66
        
           os.execv('$(pwd)/.builder.py', sys.argv)

     

       67
       67
        
           EOF

+1 -1

pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix

···

       61
       61
        
           import os, sys

     

       62
       62
        
           

     

       63
       63
        
           os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'

     

       64
       64
       -
           os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'

     

       64
       64
       +
           os.environ['JAVA_HOME'] = '${jdk.home}'

     

       65
       65
        
           

     

       66
       66
        
           os.execv('$(pwd)/.builder.py', sys.argv)

     

       67
       67
        
           EOF

+1 -1

pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix

···

       61
       61
        
           import os, sys

     

       62
       62
        
           

     

       63
       63
        
           os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'

     

       64
       64
       -
           os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'

     

       64
       64
       +
           os.environ['JAVA_HOME'] = '${jdk.home}'

     

       65
       65
        
           

     

       66
       66
        
           os.execv('$(pwd)/.builder.py', sys.argv)

     

       67
       67
        
           EOF

+5 -5

pkgs/development/tools/neoload/default.nix

···

       14
       14
        
       

     

       15
       15
        
       # the installer is very picky and demands 1.7.0.07

     

       16
       16
        
       let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = ''

     

       17
       17
       -
             JRE_VERSION	${jre}${path}	1	7	0	7

     

       18
       18
       -
             JRE_INFO	${jre}${path}	94

     

       17
       17
       +
             JRE_VERSION	${path}	1	7	0	7

     

       18
       18
       +
             JRE_INFO	${path}	94

     

       19
       19
        
           ''; };

     

       20
       20
        
       

     

       21
       21
        
           responseVarfile = writeTextFile { name = "response.varfile"; text = ''

     
···

       55
       55
        
           sed -e 's/^if \[ -f jre.tar.gz/if false          /' $src > installer

     

       56
       56
        
           chmod a+x installer

     

       57
       57
        
       

     

       58
       58
       -
           cp ${dotInstall4j ""} .install4j

     

       58
       58
       +
           cp ${dotInstall4j jre} .install4j

     

       59
       59
        
           chmod u+w .install4j

     

       60
       60
        
       

     

       61
       61
        
           sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile

     

       62
       62
        
       

     

       63
       63
        
           export HOME=`pwd`

     

       64
       64
       -
           export INSTALL4J_JAVA_HOME=${jre}

     

       64
       64
       +
           export INSTALL4J_JAVA_HOME=${jre.home}

     

       65
       65
        
           export FONTCONFIG_FILE=${fontsConf}

     

       66
       66
        
           bash -ic './installer -q -varfile response.varfile'

     

       67
       67
        
       

     

       68
       68
        
           sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties

     

       69
       69
        
       

     

       70
       70
        
           for i in $out/bin/*; do

     

       71
       71
       -
             wrapProgram $i --run 'cp ${dotInstall4j "/lib/openjdk/jre"} ~/.install4j' \

     

       71
       71
       +
             wrapProgram $i --run 'cp ${dotInstall4j "${jre.home}/jre"} ~/.install4j' \

     

       72
       72
        
                            --run 'chmod u+w ~/.install4j'

     

       73
       73
        
           done

     

       74
       74

+3 -3

pkgs/servers/monitoring/munin/default.nix

···

       1
       1
        
       { stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages

     

       2
       2
       -
       , python, ruby, openjdk, nettools

     

       2
       2
       +
       , python, ruby, jre, nettools

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       39
       39
        
           perlPackages.DBDPg

     

       40
       40
        
           python

     

       41
       41
        
           ruby

     

       42
       42
       -
           openjdk

     

       42
       42
       +
           jre

     

       43
       43
        
           # tests

     

       44
       44
        
           perlPackages.TestLongString

     

       45
       45
        
           perlPackages.TestDifferences

     
···

       91
       91
        
           PERL=${perl}/bin/perl

     

       92
       92
        
           PYTHON=${python}/bin/python

     

       93
       93
        
           RUBY=${ruby}/bin/ruby

     

       94
       94
       -
           JAVARUN=${openjdk}/bin/java

     

       94
       94
       +
           JAVARUN=${jre}/bin/java

     

       95
       95
        
           PLUGINUSER=munin

     

       96
       96
        
         '';

     

       97
       97

+4 -6

pkgs/top-level/all-packages.nix

···

       1362
       1362
        
         grafx2 = callPackage ../applications/graphics/grafx2 {};

     

       1363
       1363
        
       

     

       1364
       1364
        
         grails = callPackage ../development/web/grails {

     

       1365
       1365
       -
           jdkPath = "${openjdk}/lib/openjdk";

     

       1365
       1365
       +
           jdkPath = jdk.home;

     

       1366
       1366
        
         };

     

       1367
       1367
        
       

     

       1368
       1368
        
         graphviz = callPackage ../tools/graphics/graphviz { };

     
···

       3445
       3445
        
       

     

       3446
       3446
        
         icedtea7_jdk = callPackage ../development/compilers/icedtea rec {

     

       3447
       3447
        
           jdk = openjdk;

     

       3448
       3448
       -
           jdkPath = "${openjdk}/lib/openjdk";

     

       3448
       3448
       +
           jdkPath = openjdk.home;

     

       3449
       3449
        
           giflib = giflib_5_0;

     

       3450
       3450
        
         } // { outputs = [ "out" ]; };

     

       3451
       3451
        
       

     
···

       7617
       7617
        
         cassandra = callPackage ../servers/nosql/cassandra { };

     

       7618
       7618
        
       

     

       7619
       7619
        
         apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {

     

       7620
       7620
       -
           java = icedtea_jdk;

     

       7620
       7620
       +
           java = jdk;

     

       7621
       7621
        
         };

     

       7622
       7622
        
       

     

       7623
       7623
        
         apcupsd = callPackage ../servers/apcupsd { };

     
···

       11265
       11265
        
       

     

       11266
       11266
        
         vorbisTools = callPackage ../applications/audio/vorbis-tools { };

     

       11267
       11267
        
       

     

       11268
       11268
       -
         vue = callPackage ../applications/misc/vue {

     

       11269
       11269
       -
           jre = icedtea_jre;

     

       11270
       11270
       -
         };

     

       11268
       11268
       +
         vue = callPackage ../applications/misc/vue { };

     

       11271
       11269
        
       

     

       11272
       11270
        
         vwm = callPackage ../applications/window-managers/vwm { };

     

       11273
       11271