Merge pull request #56408 from Mic92/runtime-shell
treewide: use runtimeShell instead of stdenv.shell whenever possible
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }:
|
||||
{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText, runtimeShell }:
|
||||
|
||||
let
|
||||
version = "1.4.0";
|
||||
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
|
||||
cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png
|
||||
|
||||
cat > $out/bin/jd-gui <<EOF
|
||||
#!${stdenv.shell}
|
||||
#!${runtimeShell}
|
||||
export JAVA_HOME=${jre}
|
||||
${jre}/bin/java -jar ${jar} $@
|
||||
EOF
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme
|
||||
, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3
|
||||
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }:
|
||||
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
|
||||
, runtimeShell }:
|
||||
|
||||
let
|
||||
versionSuffix = "20190205202117.6394d03e6c";
|
||||
@@ -71,7 +72,7 @@ stdenv.mkDerivation rec {
|
||||
mv opt/keybase $out/share/
|
||||
|
||||
cat > $out/bin/keybase-gui <<EOF
|
||||
#!${stdenv.shell}
|
||||
#!${runtimeShell}
|
||||
|
||||
checkFailed() {
|
||||
if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then
|
||||
|
||||
Reference in New Issue
Block a user