Unverified Commit fbb16d6d authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #277013 from marsam/h3-outputs 

h3: add `dev` output
parents fb9e0d39 b5f5d58b

pkgs/development/misc/h3/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -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; {

pkgs/development/python-modules/h3/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ''

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;