From 6cd157f0133bcd074ff947f3e5397f0e8cdc2830 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 8 Dec 2019 15:06:59 +0100 Subject: machines/profpatsch,pkgs/profpatsch: rm `execlineb-with-builtins` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This has been upstreamed to nixpkgs proper, as a C wrapper script, in https://github.com/NixOS/nixpkgs/pull/71357 So we don’t even need bash to run execline anymore :P --- pkgs/profpatsch/execline/write-execline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/profpatsch/execline/write-execline.nix') diff --git a/pkgs/profpatsch/execline/write-execline.nix b/pkgs/profpatsch/execline/write-execline.nix index c2128ea3..f83aa2ed 100644 --- a/pkgs/profpatsch/execline/write-execline.nix +++ b/pkgs/profpatsch/execline/write-execline.nix @@ -1,4 +1,4 @@ -{ pkgs, execlineb-with-builtins }: +{ pkgs }: let escape = import ./escape.nix { inherit (pkgs) lib; }; @@ -6,7 +6,7 @@ let # Everything is escaped correctly. # TODO upstream into nixpkgs writeExeclineCommon = writer: name: { readNArgs ? 0 }: argList: writer name '' - #!${execlineb-with-builtins}/bin/execlineb -Ws${toString readNArgs} + #!${pkgs.execline}/bin/execlineb -Ws${toString readNArgs} ${escape.escapeExecline argList} ''; writeExecline = writeExeclineCommon pkgs.writeScript; -- cgit 1.4.1