mirror of
https://github.com/NixOS/nix
synced 2025-07-07 01:51:47 +02:00
* Sync with the trunk.
This commit is contained in:
commit
aa45027818
109 changed files with 3350 additions and 4010 deletions
|
@ -28,11 +28,8 @@ let
|
|||
--with-xml-flags=--nonet
|
||||
'';
|
||||
|
||||
# Include the ATerm and Bzip2 tarballs in the distribution.
|
||||
# Include the Bzip2 tarball in the distribution.
|
||||
preConfigure = ''
|
||||
stripHash ${aterm.src}
|
||||
cp -pv ${aterm.src} externals/$strippedName
|
||||
|
||||
stripHash ${bzip2.src}
|
||||
cp -pv ${bzip2.src} externals/$strippedName
|
||||
|
||||
|
@ -77,7 +74,7 @@ let
|
|||
|
||||
configureFlags = ''
|
||||
--disable-init-state
|
||||
--with-aterm=${aterm} --with-bzip2=${bzip2} --with-sqlite=${sqlite}
|
||||
--with-bzip2=${bzip2} --with-sqlite=${sqlite}
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -97,7 +94,7 @@ let
|
|||
|
||||
configureFlags = ''
|
||||
--disable-init-state --disable-shared
|
||||
--with-aterm=${aterm} --with-bzip2=${bzip2} --with-sqlite=${sqlite}
|
||||
--with-bzip2=${bzip2} --with-sqlite=${sqlite}
|
||||
'';
|
||||
|
||||
lcovFilter = [ "*/boost/*" "*-tab.*" ];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue