diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2019-01-15 23:41:31 +0100 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2019-01-16 20:37:15 +0100 |
| commit | bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 (patch) | |
| tree | 26aef5b71509a26f7986e6cf9928b7687c21787d /pkgs/servers/x11/xquartz/default.nix | |
| parent | 3956a8421f2d78bc66ad9d3c23a3b5510bc695be (diff) | |
| download | nixpkgs-bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183.tar nixpkgs-bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183.tar.gz nixpkgs-bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183.tar.bz2 nixpkgs-bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183.tar.lz nixpkgs-bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183.tar.xz nixpkgs-bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183.tar.zst nixpkgs-bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183.zip | |
treewide: use ${stdenv.shell} instead of /bin/sh where possible
Diffstat (limited to 'pkgs/servers/x11/xquartz/default.nix')
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 8cb96d0ae39..22f6ce45673 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -123,6 +123,7 @@ in stdenv.mkDerivation { cp ${./startx} $out/bin/startx substituteInPlace $out/bin/startx \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@XAUTH@" "${xorg.xauth}/bin/xauth" \ --replace "@FONT_CACHE@" "$out/bin/font_cache" \ @@ -153,12 +154,14 @@ in stdenv.mkDerivation { mkdir -p $out/lib/X11/xinit/privileged_startx.d cp ${./privileged} $out/lib/X11/xinit/privileged_startx.d/privileged substituteInPlace $out/lib/X11/xinit/privileged_startx.d/privileged \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" \ --replace "@FONT_CACHE@" "$out/bin/font_cache" cp ${./font_cache} $out/bin/font_cache substituteInPlace $out/bin/font_cache \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@ENCODINGSDIR@" "${xorg.encodings}/share/fonts/X11/encodings" \ --replace "@MKFONTDIR@" "${xorg.mkfontdir}/bin/mkfontdir" \ @@ -168,6 +171,7 @@ in stdenv.mkDerivation { cp ${./xinitrc} $out/etc/X11/xinit/xinitrc substituteInPlace $out/etc/X11/xinit/xinitrc \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@XSET@" "${xorg.xset}/bin/xset" \ --replace "@XMODMAP@" "${xorg.xmodmap}/bin/xmodmap" \ @@ -178,6 +182,7 @@ in stdenv.mkDerivation { cp ${./X11} $out/Applications/XQuartz.app/Contents/MacOS/X11 substituteInPlace $out/Applications/XQuartz.app/Contents/MacOS/X11 \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@DEFAULT_SHELL@" "${shell}" \ --replace "@DEFAULT_STARTX@" "$defaultStartX" \ --replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \ |