Commit 086b3bf9 authored by Robert Schütz's avatar Robert Schütz
Browse files

python3Packages.brotli: unvendor brotli

parent b3c34739
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@
  fetchFromGitHub,
  fetchpatch,
  cmake,
  python3Packages,
  staticOnly ? stdenv.hostPlatform.isStatic,
  testers,
}:

# ?TODO: there's also python lib in there

stdenv.mkDerivation (finalAttrs: {
  pname = "brotli";
  version = "1.1.0";
@@ -54,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
    cp ../docs/*.3 $out/share/man/man3/
  '';

  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
  passthru.tests = {
    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
    python = python3Packages.brotli;
  };

  meta = with lib; {
    homepage = "https://github.com/google/brotli";
+7 −0
Original line number Diff line number Diff line
{
  lib,
  brotli,
  buildPythonPackage,
  fetchFromGitHub,
  pkgconfig,
@@ -29,6 +30,12 @@ buildPythonPackage rec {
  # only returns information how to really build
  dontConfigure = true;

  env.USE_SYSTEM_BROTLI = 1;

  buildInputs = [
    brotli
  ];

  nativeCheckInputs = [ pytestCheckHook ];

  enabledTestPaths = [ "python/tests" ];
+3 −1
Original line number Diff line number Diff line
@@ -2189,7 +2189,9 @@ self: super: with self; {
  brother-ql = callPackage ../development/python-modules/brother-ql { };
  brotli = callPackage ../development/python-modules/brotli { };
  brotli = callPackage ../development/python-modules/brotli {
    inherit (pkgs) brotli;
  };
  brotli-asgi = callPackage ../development/python-modules/brotli-asgi { };