From 3fcbd8f3e918e330a81a664bf505cc122bc1e420 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 2 May 2023 17:29:08 +0800 Subject: [PATCH] pineapple-pictures: 0.6.6 -> 0.6.9 --- pkgs/applications/graphics/pineapple-pictures/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index ddbeb4caa42e..21115e0c794c 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "pineapple-pictures"; - version = "0.6.6"; + version = "0.6.9"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-p51FlCeViDRNGUDN//IT4bLJpP2kU0CC67BCAlm0rYk="; + sha256 = "sha256-QFKo4zMqhKzFseXMnZEBd2DPo0QObpelvYmI2tMyfRE="; }; nativeBuildInputs = [ @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { exiv2 ]; + cmakeFlags = [ + "-DPREFER_QT_5=OFF" + ]; + meta = with lib; { description = "Homebrew lightweight image viewer"; homepage = "https://github.com/BLumia/pineapple-pictures"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a46b6afe7f6..e052134fa14b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33180,7 +33180,7 @@ with pkgs; pythonPackages = python3Packages; }; - pineapple-pictures = libsForQt5.callPackage ../applications/graphics/pineapple-pictures { }; + pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { }; pinfo = callPackage ../applications/misc/pinfo { };