Skip to content

Commit 576aac5

Browse files
authored
peazip: 10.1.0 -> 10.2.0 (NixOS#370083)
2 parents a3d98c8 + ea75ad0 commit 576aac5

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

pkgs/by-name/pe/peazip/package.nix

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
stdenv,
33
lib,
44
fetchFromGitHub,
5-
libsForQt5,
5+
qt6Packages,
66
fpc,
77
lazarus,
88
xorg,
@@ -17,13 +17,13 @@
1717

1818
stdenv.mkDerivation rec {
1919
pname = "peazip";
20-
version = "10.1.0";
20+
version = "10.2.0";
2121

2222
src = fetchFromGitHub {
2323
owner = "peazip";
2424
repo = pname;
2525
rev = version;
26-
hash = "sha256-jYm3Ngwby75eUFM59tCQ7KWVywQOj+IzuPpATD+QhLo=";
26+
hash = "sha256-TyfLqT9VNSViJOWwM3KgL2tvCZE14bLlT/6DgF9IAOE=";
2727
};
2828
sourceRoot = "${src.name}/peazip-sources";
2929

@@ -33,15 +33,19 @@ stdenv.mkDerivation rec {
3333
'';
3434

3535
nativeBuildInputs = [
36-
libsForQt5.wrapQtAppsHook
36+
qt6Packages.wrapQtAppsHook
3737
lazarus
3838
fpc
3939
];
4040

41-
buildInputs = [
42-
xorg.libX11
43-
libsForQt5.libqtpas
44-
];
41+
buildInputs =
42+
[
43+
xorg.libX11
44+
]
45+
++ (with qt6Packages; [
46+
qtbase
47+
libqtpas
48+
]);
4549

4650
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
4751

@@ -50,8 +54,8 @@ stdenv.mkDerivation rec {
5054
export HOME=$(mktemp -d)
5155
pushd dev
5256
lazbuild --lazarusdir=${lazarus}/share/lazarus --add-package metadarkstyle/metadarkstyle.lpk
53-
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi
54-
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi
57+
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt6 --build-all project_pea.lpi
58+
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt6 --build-all project_peach.lpi
5559
popd
5660
'';
5761

0 commit comments

Comments
 (0)