diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/development/libraries/qrencode | |
parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qrencode')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/qrencode/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qrencode/default.nix b/nixpkgs/pkgs/development/libraries/qrencode/default.nix index a0e23813ade2..83c20fcd5120 100644 --- a/nixpkgs/pkgs/development/libraries/qrencode/default.nix +++ b/nixpkgs/pkgs/development/libraries/qrencode/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv, libobjc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "qrencode"; version = "4.1.1"; @@ -16,13 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv libpng ] ++ lib.optionals stdenv.isDarwin [ libobjc ]; - configureFlags = [ - "--with-tests" - ]; - nativeCheckInputs = [ SDL2 ]; - doCheck = true; + doCheck = false; checkPhase = '' runHook preCheck @@ -34,6 +30,11 @@ stdenv.mkDerivation rec { runHook postCheck ''; + passthru.tests = finalAttrs.finalPackage.overrideAttrs (_: { + configureFlags = [ "--with-tests" ]; + doCheck = true; + }); + meta = with lib; { homepage = "https://fukuchi.org/works/qrencode/"; description = "C library for encoding data in a QR Code symbol"; @@ -47,4 +48,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "qrencode"; }; -} +}) |