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