pyrox.dev
Merge pull request #256172 from Ericson2314/pkg-config-progress
More progress improving pkg-config info
authored by
John Ericson
and committed by
GitHub
0a991e03
a11826e3
+6
-3
pkgs/development/libraries/libjpeg-turbo/default.nix
+6
-3
pkgs/development/libraries/libjpeg-turbo/default.nix
···
24
24
, opencv
25
25
, python3
26
26
, vips
27
+
, testers
27
28
}:
28
29
29
30
assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both
30
31
31
-
stdenv.mkDerivation rec {
32
+
stdenv.mkDerivation (finalAttrs: {
32
33
33
34
pname = "libjpeg-turbo";
34
35
version = "2.1.5.1";
···
36
37
src = fetchFromGitHub {
37
38
owner = "libjpeg-turbo";
38
39
repo = "libjpeg-turbo";
39
-
rev = version;
40
+
rev = finalAttrs.version;
40
41
sha256 = "sha256-96SBBZp+/4WkXLvHKSPItNi5WuzdVccI/ZcbJOFjYYk=";
41
42
};
42
43
···
91
92
opencv
92
93
vips;
93
94
inherit (python3.pkgs) pillow imread pyturbojpeg;
95
+
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
94
96
};
95
97
96
98
meta = with lib; {
97
99
homepage = "https://libjpeg-turbo.org/";
98
100
description = "A faster (using SIMD) libjpeg implementation";
99
101
license = licenses.ijg; # and some parts under other BSD-style licenses
102
+
pkgConfigModules = [ "libjpeg" "libturbojpeg" ];
100
103
maintainers = with maintainers; [ vcunat colemickens kamadorueda ];
101
104
platforms = platforms.all;
102
105
};
103
-
}
106
+
})
+10
-4
pkgs/development/libraries/libjpeg/default.nix
+10
-4
pkgs/development/libraries/libjpeg/default.nix
···
1
-
{ lib, stdenv, fetchurl, static ? false }:
1
+
{ lib, stdenv, fetchurl
2
+
, testers
3
+
, static ? false
4
+
}:
2
5
3
-
stdenv.mkDerivation rec {
6
+
stdenv.mkDerivation (finalAttrs: {
4
7
pname = "libjpeg";
5
8
version = "9e";
6
9
7
10
src = fetchurl {
8
-
url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz";
11
+
url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz";
9
12
sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0=";
10
13
};
11
14
12
15
configureFlags = lib.optional static "--enable-static --disable-shared";
13
16
14
17
outputs = [ "bin" "dev" "out" "man" ];
18
+
19
+
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
15
20
16
21
meta = with lib; {
17
22
homepage = "https://www.ijg.org/";
18
23
description = "A library that implements the JPEG image file format";
19
24
maintainers = with maintainers; [ ];
20
25
license = licenses.free;
26
+
pkgConfigModules = [ "libjpeg" ];
21
27
platforms = platforms.unix;
22
28
};
23
-
}
29
+
})