tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
Merge pull request #226968 from delroth/zbar-0.23.92
zbar: 0.23.90 -> 0.23.92 (+ enable checkPhase)
+27
-2
+27
-2
pkgs/tools/graphics/zbar/default.nix
+27
-2
pkgs/tools/graphics/zbar/default.nix
···
24
24
, libintl
25
25
, libiconv
26
26
, Foundation
27
+
, bash
28
+
, python3
29
+
, argp-standalone
27
30
}:
28
31
29
32
stdenv.mkDerivation rec {
30
33
pname = "zbar";
31
-
version = "0.23.90";
34
+
version = "0.23.92";
32
35
33
36
outputs = [ "out" "lib" "dev" "doc" "man" ];
34
37
···
39
36
owner = "mchehab";
40
37
repo = "zbar";
41
38
rev = version;
42
-
sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U=";
39
+
sha256 = "sha256-VhVrngAX7pXZp+szqv95R6RGAJojp3svdbaRKigGb0w=";
43
40
};
44
41
45
42
nativeBuildInputs = [
···
69
66
qtx11extras
70
67
];
71
68
69
+
nativeCheckInputs = [
70
+
bash
71
+
python3
72
+
];
73
+
74
+
checkInputs = lib.optionals stdenv.isDarwin [
75
+
argp-standalone
76
+
];
77
+
78
+
# Note: postConfigure instead of postPatch in order to include some
79
+
# autoconf-generated files. The template files for the autogen'd scripts are
80
+
# not chmod +x, so patchShebangs misses them.
81
+
postConfigure = ''
82
+
patchShebangs test
83
+
'';
84
+
72
85
# Disable assertions which include -dev QtBase file paths.
73
86
env.NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG";
74
87
···
101
82
"--without-gtk"
102
83
"--without-qt"
103
84
]);
85
+
86
+
doCheck = true;
87
+
88
+
preCheck = lib.optionalString stdenv.isDarwin ''
89
+
export NIX_LDFLAGS="$NIX_LDFLAGS -largp"
90
+
'';
104
91
105
92
dontWrapQtApps = true;
106
93
dontWrapGApps = true;