public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "skawarePackages.execline: wrap execlineb with tools"

Browse Source 
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.
This commit is contained in:
Profpatsch 2019-10-14 16:08:52 +02:00
parent c1e21ab5fd
commit bbcdd01f6b
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/skaware/build-skaware-package.nix
View File

@ -19,10 +19,6 @@ in {
# mostly for moving and deleting files from the build directory # mostly for moving and deleting files from the build directory
# : lines # : lines
, postInstall , postInstall
# packages with setup hooks that should be run
# (see definition of `makeSetupHook`)
# : list drv
, setupHooks ? []
# : list Maintainer # : list Maintainer
, maintainers ? [] , maintainers ? []
@ -67,8 +63,6 @@ in stdenv.mkDerivation {
dontDisableStatic = true; dontDisableStatic = true;
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = setupHooks;
configureFlags = configureFlags ++ [ configureFlags = configureFlags ++ [
"--enable-absolute-paths" "--enable-absolute-paths"
(if stdenv.isDarwin (if stdenv.isDarwin

9
pkgs/tools/misc/execline/default.nix
View File

@ -1,4 +1,4 @@
{ skawarePackages, makeWrapper }: { skawarePackages }:
with skawarePackages; with skawarePackages;
@ -11,8 +11,6 @@ buildPackage {
outputs = [ "bin" "lib" "dev" "doc" "out" ]; outputs = [ "bin" "lib" "dev" "doc" "out" ];
setupHooks = [ makeWrapper ];
# TODO: nsss support # TODO: nsss support
configureFlags = [ configureFlags = [
"--libdir=\${lib}/lib" "--libdir=\${lib}/lib"
@ -32,11 +30,6 @@ buildPackage {
mv doc $doc/share/doc/execline/html mv doc $doc/share/doc/execline/html
mv examples $doc/share/doc/execline/examples 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
''; '';
} }