Use ++ for constructing builder args
svn path=/nixpkgs/trunk/; revision=6643
This commit is contained in:
parent
7d83cda3c1
commit
bef5dd93a8
@ -98,13 +98,12 @@ let {
|
|||||||
if attrs ? args then
|
if attrs ? args then
|
||||||
attrs.args
|
attrs.args
|
||||||
else
|
else
|
||||||
["-e" (
|
["-e"] ++ (
|
||||||
if attrs ? builder then
|
if attrs ? builder then
|
||||||
[./fix-builder.sh attrs.builder]
|
[./fix-builder.sh attrs.builder]
|
||||||
else
|
else
|
||||||
[./fix-builder.sh ./default-builder.sh]
|
[./fix-builder.sh ./default-builder.sh]
|
||||||
)
|
);
|
||||||
];
|
|
||||||
inherit stdenv system;
|
inherit stdenv system;
|
||||||
C_INCLUDE_PATH = mingwRuntimeSrc + "/include" + ":" + w32apiSrc + "/include";
|
C_INCLUDE_PATH = mingwRuntimeSrc + "/include" + ":" + w32apiSrc + "/include";
|
||||||
CPLUS_INCLUDE_PATH = mingwRuntimeSrc + "/include" + ":" + w32apiSrc + "/include";
|
CPLUS_INCLUDE_PATH = mingwRuntimeSrc + "/include" + ":" + w32apiSrc + "/include";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user