libjpeg_{orgignal,turbo}: Add meta.pkgConfigModules
and test
Co-Authored-By: Alex Ameen <alex.ameen.tx@gmail.com>
This commit is contained in:
parent
420f7d5ed7
commit
4b2e84f301
|
@ -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;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue