Skip to content

Commit

Permalink
peazip: 10.1.0 -> 10.2.0 (#370083)
Browse files Browse the repository at this point in the history
  • Loading branch information
OPNA2608 authored Jan 4, 2025
2 parents a3d98c8 + ea75ad0 commit 576aac5
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions pkgs/by-name/pe/peazip/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
libsForQt5,
qt6Packages,
fpc,
lazarus,
xorg,
Expand All @@ -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";

Expand All @@ -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}";

Expand All @@ -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
'';

Expand Down

0 comments on commit 576aac5

Please sign in to comment.