diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-02-26 11:45:54 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-02-26 14:10:49 +0000 |
| commit | dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1 (patch) | |
| tree | 9717b203342cd121abcdfde5ba8b66235c3ad67c /pkgs/tools/typesetting/fop | |
| parent | 1233c8d9e9bc463899ed6a8cf0232e6bf36475ee (diff) | |
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
Diffstat (limited to 'pkgs/tools/typesetting/fop')
| -rw-r--r-- | pkgs/tools/typesetting/fop/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 5f926f771c5f..9240926ab5b4 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jdk }: +{ fetchurl, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "fop-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # There is a fop script in the source archive, but it has many impurities. # Instead of patching out 90 % of the script, we write our own. cat > "$out/bin/fop" <<EOF - #!${stdenv.shell} + #!${runtimeShell} java_exec_args="-Djava.awt.headless=true" exec ${jdk.jre}/bin/java \$java_exec_args -classpath "$out/lib/*" org.apache.fop.cli.Main "\$@" EOF |