diff options
author | Robert Scott <code@humanleg.org.uk> | 2023-04-26 14:35:55 +0200 |
---|---|---|
committer | Pierre Bourdon <delroth@gmail.com> | 2023-04-26 14:35:55 +0200 |
commit | fdd4f77e5c1e604b831a50df60945052bb720163 (patch) | |
tree | 0c98b4d69b05323edf061c0c6c24fb081dbe1416 | |
parent | 8ae1865b52bd77162dba6fa32d48cdade697d0fd (diff) | |
download | nixpkgs-fdd4f77e5c1e604b831a50df60945052bb720163.tar nixpkgs-fdd4f77e5c1e604b831a50df60945052bb720163.tar.gz nixpkgs-fdd4f77e5c1e604b831a50df60945052bb720163.tar.bz2 nixpkgs-fdd4f77e5c1e604b831a50df60945052bb720163.tar.lz nixpkgs-fdd4f77e5c1e604b831a50df60945052bb720163.tar.xz nixpkgs-fdd4f77e5c1e604b831a50df60945052bb720163.tar.zst nixpkgs-fdd4f77e5c1e604b831a50df60945052bb720163.zip |
zbar: enable checkPhase on Darwin
-rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 540baa168fc..31fd9742d23 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -26,6 +26,7 @@ , Foundation , bash , python3 +, argp-standalone }: stdenv.mkDerivation rec { @@ -73,6 +74,10 @@ stdenv.mkDerivation rec { 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. @@ -97,7 +102,11 @@ stdenv.mkDerivation rec { "--without-qt" ]); - doCheck = !stdenv.isDarwin; + doCheck = true; + + preCheck = lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS="$NIX_LDFLAGS -largp" + ''; dontWrapQtApps = true; dontWrapGApps = true; |