diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
| commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
| tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/servers/x11 | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
| download | nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.gz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.bz2 nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.lz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.xz nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.zst nixlib-5185bc177309c62e53dad1ad346d1220f0e77bd4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 16a4aeb1ce58..79b99faea9b9 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -37,7 +37,6 @@ # that point into the user's profile. let - shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; installer = writeScript "xquartz-install" '' NIX_LINK=$HOME/.nix-profile @@ -138,7 +137,7 @@ in stdenv.mkDerivation { defaultStartX="$out/bin/startx -- $out/bin/Xquartz" ruby ${./patch_plist.rb} \ - ${shellEscape (builtins.toXML { + ${lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; XQUARTZ_DEFAULT_SHELL = "${shell}"; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; |