File tree Expand file tree Collapse file tree 2 files changed +14
-7
lines changed Expand file tree Collapse file tree 2 files changed +14
-7
lines changed Original file line number Diff line number Diff line change 7575 } ;
7676 shellEnv = utils . shellEnv homeDirectory ;
7777 wrapClojure = utils . wrapClojure homeDirectory ;
78+ wrapPrograms = utils . wrapPrograms homeDirectory ;
7879 } ;
7980}
Original file line number Diff line number Diff line change @@ -14,12 +14,18 @@ rec {
1414 '' ;
1515 } ;
1616 } ;
17- wrapClojure = homeDirectory : clojure :
18- ( pkgs . runCommandNoCC "locked-clojure" { buildInputs = [ pkgs . makeWrapper ] ; } ''
17+ wrapPrograms = homeDirectory : name : paths :
18+ let script = pkgs . lib . concatMapStrings ( path : ''
19+ makeWrapper "${ path } " "$out/bin/$(basename "${ path } ")" \
20+ --run "source ${ shellEnv homeDirectory } "
21+ '' )
22+ paths ;
23+ in
24+ pkgs . runCommandNoCC name { buildInputs = [ pkgs . makeWrapper ] ; } ''
1925 mkdir -p $out/bin
20- makeWrapper ${ clojure } /bin/clojure $out/bin/clojure \
21- --run "source ${ shellEnv homeDirectory } "
22- makeWrapper ${ clojure } /bin/clj $out/bin/clj \
23- --run "source ${ shellEnv homeDirectory } "
24- '' ) ;
26+ ${ script }
27+ '' ;
28+ wrapClojure = homeDirectory : clojure :
29+ wrapPrograms homeDirectory "locked-clojure" [ " ${ clojure } /bin/clojure "
30+ " ${ clojure } /bin/clj" ] ;
2531}
You can’t perform that action at this time.
0 commit comments