Unverified Commit 576aac57 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

peazip: 10.1.0 -> 10.2.0 (#370083)

parents a3d98c86 ea75ad05
Loading
Loading
Loading
Loading
+14 −10
Original line number Diff line number Diff line
@@ -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 = [
  buildInputs =
    [
      xorg.libX11
    libsForQt5.libqtpas
  ];
    ]
    ++ (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
  '';