Skip to content

Commit

Permalink
skawarePackages.execline: wrap execlineb with tools
Browse files Browse the repository at this point in the history
The execlineb program is the launcher (and lexer) of execline scripts.
So it makes a lot of sense to have all the small tools in scope by
default.
We append to the end of PATH so that they can be easily overwritten by
the user.

Co-authored-by: Alyssa Ross <hi@alyssa.is>
  • Loading branch information
Profpatsch and alyssais committed Feb 23, 2019
1 parent fae3c6f commit b64d25c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
6 changes: 6 additions & 0 deletions pkgs/build-support/skaware/build-skaware-package.nix
Expand Up @@ -19,6 +19,10 @@ 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 ? []

Expand Down Expand Up @@ -82,6 +86,8 @@ in stdenv.mkDerivation {
dontDisableStatic = true;
enableParallelBuilding = true;

nativeBuildInputs = setupHooks;

configureFlags = configureFlags ++ [
"--enable-absolute-paths"
(if stdenv.isDarwin
Expand Down
9 changes: 8 additions & 1 deletion pkgs/tools/misc/execline/default.nix
@@ -1,4 +1,4 @@
{ stdenv, skawarePackages }:
{ stdenv, skawarePackages, makeWrapper }:

with skawarePackages;

Expand All @@ -11,6 +11,8 @@ buildPackage {

outputs = [ "bin" "lib" "dev" "doc" "out" ];

setupHooks = [ makeWrapper ];

# TODO: nsss support
configureFlags = [
"--libdir=\${lib}/lib"
Expand All @@ -30,6 +32,11 @@ 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
'';

}

0 comments on commit b64d25c

Please sign in to comment.