diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-02-14 09:53:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-14 09:53:03 +0000 |
commit | 200610b849c0aeb174a63e7526b7376aa8a339bf (patch) | |
tree | f57988f969df0344ef355473653daf0939a0d402 /pkgs/tools/compression | |
parent | fa169bb239d7b2d860af851573569182ee5e0127 (diff) | |
parent | 46cc80cc78abdacca55f036a4f0341b96d660255 (diff) |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/gtest/default.nix pkgs/development/libraries/hidapi/default.nix
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index dfac5af0980be..3d15cbd395c40 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,18 +4,19 @@ , cmake , fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic +, testers }: # ?TODO: there's also python lib in there -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brotli"; version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { cp ../docs/*.3 $out/share/man/man3/ ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; @@ -72,6 +75,10 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; + pkgConfigModules = [ + "libbrotlidec" + "libbrotlienc" + ]; platforms = platforms.all; }; -} +}) |