From bbcdd01f6bc5b6d185c6f46df0c882efd63ebdd1 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 14 Oct 2019 16:08:52 +0200
Subject: [PATCH] Revert "skawarePackages.execline: wrap execlineb with tools"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using wrapProgram adds a call to `bash` around every call
of `execline`, which clearly misses the basic idea behind
`execline` in the first place …

This reverts commit b64d25c44782027414509460c1900646dee57db1.
---
 pkgs/build-support/skaware/build-skaware-package.nix | 6 ------
 pkgs/tools/misc/execline/default.nix                 | 9 +--------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index ce32279710e..9b159a994c8 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -19,10 +19,6 @@ in {
   # mostly for moving and deleting files from the build directory
   # : lines
 , postInstall
-  # packages with setup hooks that should be run
-  # (see definition of `makeSetupHook`)
-  # : list drv
-, setupHooks ? []
   # : list Maintainer
 , maintainers ? []
 
@@ -67,8 +63,6 @@ in stdenv.mkDerivation {
   dontDisableStatic = true;
   enableParallelBuilding = true;
 
-  nativeBuildInputs = setupHooks;
-
   configureFlags = configureFlags ++ [
     "--enable-absolute-paths"
     (if stdenv.isDarwin
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 5a967ea2095..05c186d7640 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -1,4 +1,4 @@
-{ skawarePackages, makeWrapper }:
+{ skawarePackages }:
 
 with skawarePackages;
 
@@ -11,8 +11,6 @@ buildPackage {
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
 
-  setupHooks = [ makeWrapper ];
-
   # TODO: nsss support
   configureFlags = [
     "--libdir=\${lib}/lib"
@@ -32,11 +30,6 @@ buildPackage {
 
     mv doc $doc/share/doc/execline/html
     mv examples $doc/share/doc/execline/examples
-
-    # finally, add all tools to PATH so they are available
-    # from within execlineb scripts by default
-    wrapProgram $bin/bin/execlineb \
-      --suffix PATH : $bin/bin
   '';
 
 }