From ea75ad05741a48abc6785455e92783ddd778b466 Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Thu, 2 Jan 2025 02:00:08 +0100 Subject: [PATCH] peazip: 10.1.0 -> 10.2.0 --- pkgs/by-name/pe/peazip/package.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index b7770087d7bc5..c93f33dfa45bb 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - libsForQt5, + qt6Packages, fpc, lazarus, xorg, @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "10.1.0"; + version = "10.2.0"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-jYm3Ngwby75eUFM59tCQ7KWVywQOj+IzuPpATD+QhLo="; + hash = "sha256-TyfLqT9VNSViJOWwM3KgL2tvCZE14bLlT/6DgF9IAOE="; }; sourceRoot = "${src.name}/peazip-sources"; @@ -33,15 +33,19 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - libsForQt5.wrapQtAppsHook + qt6Packages.wrapQtAppsHook lazarus fpc ]; - buildInputs = [ - xorg.libX11 - libsForQt5.libqtpas - ]; + buildInputs = + [ + xorg.libX11 + ] + ++ (with qt6Packages; [ + qtbase + libqtpas + ]); NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; @@ -50,8 +54,8 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) pushd dev lazbuild --lazarusdir=${lazarus}/share/lazarus --add-package metadarkstyle/metadarkstyle.lpk - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt6 --build-all project_pea.lpi + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt6 --build-all project_peach.lpi popd '';