Revert "skawarePackages.execline: wrap execlineb with tools"
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 b64d25c447
.
This commit is contained in:
parent
c1e21ab5fd
commit
bbcdd01f6b
|
@ -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
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue