File tree 2 files changed +8
-4
lines changed
2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 13
13
# in the context automatically.
14
14
else "${ target } " ;
15
15
16
- arx = { archive , startup } :
16
+ arx = { drvToBundle , archive , startup } :
17
17
stdenv . mkDerivation {
18
- name = "arx" ;
18
+ name = if drvToBundle != null then "${ drvToBundle . pname } -arx" else "arx" ;
19
+ passthru = {
20
+ inherit drvToBundle ;
21
+ } ;
19
22
buildCommand = ''
20
23
# tmpdir has a additional `/` in the beginning to work around `QualifiedPath` checking for `|/|./|../|`
21
24
${ haskellPackages . arx } /bin/arx tmpx \
78
81
meta . platforms = lib . platforms . linux ;
79
82
} ;
80
83
81
- makebootstrap = { targets , startup } :
84
+ makebootstrap = { targets , startup , drvToBundle ? null } :
82
85
arx {
83
- inherit startup ;
86
+ inherit drvToBundle startup ;
84
87
archive = maketar {
85
88
inherit targets ;
86
89
} ;
Original file line number Diff line number Diff line change 40
40
'' ;
41
41
in
42
42
nix-bundle . makebootstrap {
43
+ drvToBundle = drv ;
43
44
targets = [ script ] ;
44
45
startup = ".${ builtins . unsafeDiscardStringContext script } '\" $@\" '" ;
45
46
} ;
You can’t perform that action at this time.
0 commit comments