BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #226968 from delroth/zbar-0.23.92

Browse source 
zbar: 0.23.90 -> 0.23.92 (+ enable checkPhase)
This commit is contained in:
7c6f434c 2023-04-26 18:50:31 +00:00 committed by GitHub
commit dd598be67a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/tools/graphics/zbar/default.nix
View file

@ -24,11 +24,14 @@
, libintl , libintl
, libiconv , libiconv
, Foundation , Foundation
, bash
, python3
, argp-standalone
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zbar"; pname = "zbar";
version = "0.23.90"; version = "0.23.92";
outputs = [ "out" "lib" "dev" "doc" "man" ]; outputs = [ "out" "lib" "dev" "doc" "man" ];
@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
owner = "mchehab"; owner = "mchehab";
repo = "zbar"; repo = "zbar";
rev = version; rev = version;
sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; sha256 = "sha256-VhVrngAX7pXZp+szqv95R6RGAJojp3svdbaRKigGb0w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -66,6 +69,22 @@ stdenv.mkDerivation rec {
qtx11extras qtx11extras
]; ];
nativeCheckInputs = [
bash
python3
];
checkInputs = lib.optionals stdenv.isDarwin [
argp-standalone
];
# Note: postConfigure instead of postPatch in order to include some
# autoconf-generated files. The template files for the autogen'd scripts are
# not chmod +x, so patchShebangs misses them.
postConfigure = ''
patchShebangs test
'';
# Disable assertions which include -dev QtBase file paths. # Disable assertions which include -dev QtBase file paths.
env.NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG"; env.NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG";
@ -83,6 +102,12 @@ stdenv.mkDerivation rec {
"--without-qt" "--without-qt"
]); ]);
doCheck = true;
preCheck = lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS="$NIX_LDFLAGS -largp"
'';
dontWrapQtApps = true; dontWrapQtApps = true;
dontWrapGApps = true; dontWrapGApps = true;