diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 13c8f8d0424e..a672bf38b004 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -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; { diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index f512d7c08cc5..f5413e544843 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -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 '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 863e7e076bda..9498eeb390a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;