Merge pull request #277013 from marsam/h3-outputs

h3: add `dev` output
This commit is contained in:
Mario Rodas 2023-12-29 14:12:39 -05:00 committed by GitHub
commit fbb16d6d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View File

@ -2,7 +2,7 @@
, stdenv
, cmake
, fetchFromGitHub
, static ? stdenv.hostPlatform.isStatic
, withFilters ? false
}:
let
@ -18,16 +18,19 @@ let
inherit hash;
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_BENCHMARKS=OFF"
"-DBUILD_FUZZERS=OFF"
"-DBUILD_GENERATORS=OFF"
"-DENABLE_COVERAGE=OFF"
"-DENABLE_FORMAT=OFF"
"-DENABLE_LINTING=OFF"
(lib.cmakeBool "BUILD_FILTERS" withFilters)
];
meta = with lib; {

View File

@ -50,7 +50,7 @@ buildPythonPackage rec {
prePatch =
let
cmakeCommands = ''
include_directories(${h3}/include/h3)
include_directories(${lib.getDev h3}/include/h3)
link_directories(${h3}/lib)
'';
in ''

View File

@ -18141,7 +18141,7 @@ with pkgs;
### DEVELOPMENT / MISC
inherit (callPackage ../development/misc/h3 { }) h3_3 h3_4;
inherit (callPackages ../development/misc/h3 { }) h3_3 h3_4;
h3 = h3_3;