Skip to content

Commit 2b00acd

Browse files
committed
better structure flake (fix macos build)
1 parent 41d25cd commit 2b00acd

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

flake.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
];
4141
};
4242
enableShared = !pkgs.stdenv.hostPlatform.isStatic;
43+
enableTesting = false;
4344
stdenv = pkgs.llvmPackages_20.stdenv;
44-
operon = import ./operon.nix { inherit stdenv pkgs system; enableShared = enableShared; };
45+
operon = import ./operon.nix { inherit stdenv pkgs system; enableShared = enableShared; enableTesting = enableTesting; };
4546
in
4647
rec
4748
{
@@ -52,12 +53,10 @@
5253

5354
cli = operon.overrideAttrs (old: {
5455
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" "-DCPM_USE_LOCAL_PACKAGES=ON" ];
55-
enableShared = true;
5656
});
5757

5858
cli-static = operon.overrideAttrs (old: {
5959
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" "-DCPM_USE_LOCAL_PACKAGES=ON" ];
60-
enableShared = false;
6160
});
6261

6362
library = operon.overrideAttrs (old: {

operon.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, pkgs, system, enableShared ? true }:
1+
{ stdenv, pkgs, system, enableShared ? true, enableTesting ? true }:
22
stdenv.mkDerivation rec {
33
name = "operon";
44
src = ./.;
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
2626
cpp-sort
2727
cpptrace
2828
cxxopts
29-
doctest
3029
eigen
3130
eve
3231
fast-float
@@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
3938
libdwarf
4039
mdspan
4140
microsoft-gsl
42-
nanobench
4341
ned14-outcome
4442
ned14-quickcpplib
4543
ned14-status-code
@@ -54,5 +52,5 @@ stdenv.mkDerivation rec {
5452
vstat
5553
xxHash
5654
zstd
57-
]);
55+
]) ++ (with pkgs; pkgs.lib.optionals enableTesting [ doctest nanobench ]);
5856
}

0 commit comments

Comments
 (0)