diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-09-19 15:10:52 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-09-21 10:33:48 -0400 |
commit | 4b2e84f3016e12df9a672b51bb5acb2a18daa3f1 (patch) | |
tree | 97ea657e4cb5ce65729851d5e6ccff86e6c58e84 | |
parent | 420f7d5ed7077417d15f9f0b6a432aeb2514eeed (diff) | |
download | nixpkgs-4b2e84f3016e12df9a672b51bb5acb2a18daa3f1.tar nixpkgs-4b2e84f3016e12df9a672b51bb5acb2a18daa3f1.tar.gz nixpkgs-4b2e84f3016e12df9a672b51bb5acb2a18daa3f1.tar.bz2 nixpkgs-4b2e84f3016e12df9a672b51bb5acb2a18daa3f1.tar.lz nixpkgs-4b2e84f3016e12df9a672b51bb5acb2a18daa3f1.tar.xz nixpkgs-4b2e84f3016e12df9a672b51bb5acb2a18daa3f1.tar.zst nixpkgs-4b2e84f3016e12df9a672b51bb5acb2a18daa3f1.zip |
libjpeg_{orgignal,turbo}: Add `meta.pkgConfigModules` and test
Co-Authored-By: Alex Ameen <alex.ameen.tx@gmail.com>
-rw-r--r-- | pkgs/development/libraries/libjpeg-turbo/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/libjpeg/default.nix | 14 |
2 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 27d4fda2ddc..711f05779e8 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -24,11 +24,12 @@ , opencv , python3 , vips +, testers }: assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; version = "2.1.5.1"; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-96SBBZp+/4WkXLvHKSPItNi5WuzdVccI/ZcbJOFjYYk="; }; @@ -91,13 +92,15 @@ stdenv.mkDerivation rec { opencv vips; inherit (python3.pkgs) pillow imread pyturbojpeg; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses + pkgConfigModules = [ "libjpeg" "libturbojpeg" ]; maintainers = with maintainers; [ vcunat colemickens kamadorueda ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 6a6009c98e9..aaa481e8fd5 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, static ? false }: +{ lib, stdenv, fetchurl +, testers +, static ? false +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjpeg"; version = "9e"; src = fetchurl { - url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz"; + url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0="; }; @@ -13,11 +16,14 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.ijg.org/"; description = "A library that implements the JPEG image file format"; maintainers = with maintainers; [ ]; license = licenses.free; + pkgConfigModules = [ "libjpeg" ]; platforms = platforms.unix; }; -} +}) |