From 6cd157f0133bcd074ff947f3e5397f0e8cdc2830 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
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
---
 machines/profpatsch/pkgs.nix  | 11 -----------
 machines/profpatsch/shiki.nix |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'machines')

diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index 80e73829..df60fb62 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -102,16 +102,6 @@ let
         --replace 'notify-send' '${notify-send}'
     '';
 
-  # wrapper for execlineb that doesn’t need the execline commands
-  # in PATH to work (making them appear like “builtins”)
-  execlineb-with-builtins =
-    let eldir = "${pkgs.execline}/bin";
-    in pkgs.writeScriptBin "execlineb" ''
-      #!${eldir}/execlineb -s0
-      ${eldir}/importas oldpath PATH
-      env PATH=${eldir}:''${oldpath} ${eldir}/execlineb $@
-    '';
-
   dhall-flycheck = pkgs.vuizvui.profpatsch.haskellPackages.callPackage
     (import "${pkgs.fetchFromGitHub {
       owner = "Profpatsch";
@@ -133,7 +123,6 @@ in
     saneGhci
     /*searx*/
     pyrnotify
-    execlineb-with-builtins
     dhall-flycheck
     ;
 }
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index c51bab2c..9a80001f 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -176,7 +176,7 @@ in {
         # pkgs.vuizvui.profpatsch.nix-gen      # generate nix expressions
         pkgs.vuizvui.profpatsch.watch-server # restart server on code change
         pkgs.vuizvui.profpatsch.until        # restart until cmd succeeds
-        myPkgs.execlineb-with-builtins
+        execline
         dhall
         myPkgs.dhall-flycheck
       ];
-- 
cgit 1.4.1