nix build: fix xo-arena, xo-alloc2 packaging
This commit is contained in:
parent
1a6bf8f2f3
commit
4dd0deba1a
2 changed files with 19 additions and 3 deletions
|
|
@ -10,7 +10,9 @@
|
|||
# xo dependencies
|
||||
xo-facet,
|
||||
xo-randomgen,
|
||||
xo-arena,
|
||||
xo-subsys,
|
||||
xo-testutil,
|
||||
# xo-callback,
|
||||
# xo-unit,
|
||||
# xo-reflect,
|
||||
|
|
@ -47,6 +49,8 @@ stdenv.mkDerivation (finalattrs:
|
|||
cli11
|
||||
xo-randomgen
|
||||
xo-cmake
|
||||
] ++ lib.optionals doCheck [
|
||||
xo-testutil
|
||||
] ++ lib.optionals buildDocs [
|
||||
doxygen
|
||||
sphinx
|
||||
|
|
@ -58,6 +62,7 @@ stdenv.mkDerivation (finalattrs:
|
|||
python3Packages.pillow
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
xo-arena
|
||||
xo-facet
|
||||
xo-subsys
|
||||
# xo-callback
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
{
|
||||
# nixpkgs dependencies
|
||||
lib, stdenv, cmake, catch2,
|
||||
lib, stdenv,
|
||||
|
||||
cmake, catch2,
|
||||
doxygen,
|
||||
elfutils ? null, # ignored on osx
|
||||
libunwind,
|
||||
pkg-config,
|
||||
|
||||
python3Packages,
|
||||
|
||||
|
|
@ -35,8 +40,11 @@ stdenv.mkDerivation (finalattrs:
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake catch2
|
||||
xo-cmake xo-randomgen
|
||||
cmake
|
||||
catch2
|
||||
pkg-config
|
||||
xo-cmake
|
||||
xo-randomgen
|
||||
] ++ lib.optionals buildDocs [
|
||||
doxygen
|
||||
sphinx
|
||||
|
|
@ -50,5 +58,8 @@ stdenv.mkDerivation (finalattrs:
|
|||
propagatedBuildInputs = [
|
||||
xo-reflectutil
|
||||
xo-indentlog
|
||||
libunwind
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
elfutils.dev
|
||||
];
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue