diff --git a/pkgs/development/libraries/qzxing/default.nix b/pkgs/development/libraries/qzxing/default.nix index e8ac307dfe0f..1159a6c9819c 100644 --- a/pkgs/development/libraries/qzxing/default.nix +++ b/pkgs/development/libraries/qzxing/default.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ASgsF5ocNWAiIy2jm6ygpDkggBcEpno6iVNWYkuWcVI="; }; + # greaterThan/lessThan don't handle versions, use versionAtLeast/versionAtMost instead + # Versions are different due to versionAtLeast/-Most using an inclusive limit, while greater-/lessThan use exclusive ones + postPatch = '' + substituteInPlace src/QZXing-components.pri \ + --replace-fail 'lessThan(QT_VERSION, 6.2)' 'versionAtMost(QT_VERSION, 6.1)' \ + --replace-fail 'greaterThan(QT_VERSION, 6.1)' 'versionAtLeast(QT_VERSION, 6.2)' + ''; + # QMake can't find qtmultimedia in buildInputs strictDeps = false; @@ -47,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Qt/QML wrapper library for the ZXing library"; homepage = "https://github.com/ftylitak/qzxing"; - license = licenses.asl20; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.unix; pkgConfigModules = [ "QZXing" ];