diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:29:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:36:54 +0100 |
| commit | 7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e (patch) | |
| tree | addea6c250c34b29acb432fd2602b58922771868 /pkgs/servers | |
| parent | 1743953cc5dee3ec78d1769ec5edff18a27607cb (diff) | |
| parent | 9ae72f2715d800f25f7dca0dec69624968d52909 (diff) | |
| download | nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.gz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.bz2 nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.lz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.xz nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.zst nixlib-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.zip | |
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting after qt4 timing out for the first time: https://hydra.nixos.org/eval/1412641?compare=1412561
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/oracle-xe/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 6b15c165dfdf..4f9b3a6b443c 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { for i in "$out"/bin/*; do wrapProgram "$i" \ --prefix "PATH" : "${java}/bin/" \ - --set "FUSEKI_HOME" '"''${FUSEKI_HOME:-'"$out"'}"' \ + --set-default "FUSEKI_HOME" "$out" \ ; done ''; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index e86406cd469c..9068ca70cc6e 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { makeWrapper "$i" "$out/bin/''${i##*/}" \ --set ORACLE_HOME "$out/libexec/oracle" \ --set ORACLE_SID XE \ - --set NLS_LANG '$("'"$out"'/libexec/oracle/bin/nls_lang.sh")' \ + --run "export NLS_LANG=\$($out/libexec/oracle/bin/nls_lang.sh)" \ --prefix PATH : "$out/libexec/oracle/bin" done ''; |