Skip to content

Commit b2fdbbd

Browse files
committed
update flake
1 parent a001aea commit b2fdbbd

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

flake.nix

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@
3939
})
4040
];
4141
};
42+
enableShared = !pkgs.stdenv.hostPlatform.isStatic;
4243
stdenv = pkgs.llvmPackages_20.stdenv;
43-
operon = import ./operon.nix { inherit stdenv pkgs system; };
44+
operon = import ./operon.nix { inherit stdenv pkgs system; enableShared = enableShared; };
4445
in
4546
rec
4647
{
@@ -49,12 +50,22 @@
4950
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" "-DCPM_USE_LOCAL_PACKAGES=ON" ];
5051
});
5152

53+
cli = operon.overrideAttrs (old: {
54+
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" "-DCPM_USE_LOCAL_PACKAGES=ON" ];
55+
enableShared = "true";
56+
});
57+
58+
cli-static = operon.overrideAttrs (old: {
59+
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" "-DCPM_USE_LOCAL_PACKAGES=ON" ];
60+
enableShared = "false";
61+
});
62+
5263
library = operon.overrideAttrs (old: {
53-
enableShared = true;
64+
enableShared = "true";
5465
});
5566

5667
library-static = operon.overrideAttrs (old: {
57-
enableShared = false;
68+
enableShared = "false";
5869
});
5970
};
6071

operon.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
{ stdenv, pkgs, system }:
1+
{ stdenv, pkgs, system, enableShared ? true }:
22
stdenv.mkDerivation rec {
33
name = "operon";
44
src = ./.;
55

6-
enableShared = true;
7-
86
cmakePreset = {
97
"x86_64-linux" = "build-linux";
108
"x86_64-darwin" = "build-linux";
@@ -14,6 +12,7 @@ stdenv.mkDerivation rec {
1412
cmakeFlags = [
1513
"--preset ${cmakePreset}"
1614
"-DUSE_SINGLE_PRECISION=ON"
15+
"-DBUILD_SHARED_LIBS=${enableShared}"
1716
];
1817
cmakeBuildType = "Release";
1918

@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
4746
ned14-status-code
4847
pkg-config
4948
pratt-parser
50-
scnlib
49+
(scnlib.overrideAttrs({ enableShared = enableShared; }))
5150
simdutf # required by scnlib
5251
span-lite
5352
taskflow

0 commit comments

Comments
 (0)