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/applications/networking/mailreaders | |
| 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/applications/networking/mailreaders')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/msgviewer/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 6e2e8d58c6760..88e573f6cf42a 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, unzip, jre }: +{ stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: let version = "1.9"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { mv $dir/${uname}/* $dir rmdir $dir/${uname} cat <<_EOF > $out/bin/msgviewer - #!${stdenv.shell} -eu + #!${runtimeShell} -eu exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" _EOF chmod 755 $out/bin/msgviewer diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a8c322b42b831..0da451ed51e22 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell }: let muttWrapper = writeScript "mutt" '' - #!${stdenv.shell} -eu + #!${runtimeShell} -eu echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' echo "" |