diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-02-07 09:19:50 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-02-07 12:15:36 -0500 |
| commit | 18a0b827500f99c613d0a70d92f55fbd13e59474 (patch) | |
| tree | 8a8f394ef193fdc9ce7a522830645dc9b7646480 | |
| parent | 2c1fc43a4331a91deb72c1fd1e711ce170e15d90 (diff) | |
bzip2: Add `meta.pkgConfigModules` and test
| -rw-r--r-- | pkgs/development/libraries/libappindicator/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 0819d004017c2..8e68ea3f9cb63 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; maintainers = [ maintainers.msteen ]; # TODO: Resolve the issues with the Mono bindings. - broken = monoSupport && (gtkVersion != "2"); + broken = monoSupport; }; }) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3b48195d11d69..be456cf594427 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl , linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin , autoreconfHook +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -8,7 +9,9 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: let + inherit (finalAttrs) version; +in { pname = "bzip2"; version = "1.0.8"; @@ -53,12 +56,15 @@ stdenv.mkDerivation rec { ln -s $out/lib/libbz2.so.1.0.* $out/lib/libbz2.so.1.0 ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "High-quality data compression program"; homepage = "https://www.sourceware.org/bzip2"; changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD"; license = licenses.bsdOriginal; + pkgConfigModules = [ "bzip2" ]; platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; -} +}) |