Unverified Commit 46689d5f authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

libqt5pas,lazarus-qt: 3.2-0 -> 3.6-0, init Qt6 variants (#368201)

parents 67bdaab2 c39894d8

pkgs/applications/editors/cudatext/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
, python3



# Qt5

, libqt5pas

, qt5

, libsForQt5



, widgetset ? "qt5"

# See https://github.com/Alexey-T/CudaText-lexers
@@ -59,13 +58,13 @@ stdenv.mkDerivation rec { 
  '';



  nativeBuildInputs = [ lazarus fpc ]

    ++ lib.optional (widgetset == "qt5") qt5.wrapQtAppsHook;

    ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;



  buildInputs = [ libX11 ]

    ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ pango cairo glib atk gdk-pixbuf ]

    ++ lib.optional (widgetset == "gtk2") gtk2

    ++ lib.optional (widgetset == "gtk3") gtk3

    ++ lib.optional (widgetset == "qt5") libqt5pas;

    ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;



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

pkgs/by-name/do/doublecmd/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  glib,

  lazarus,

  libX11,

  libqt5pas,

  libqtpas,

  wrapQtAppsHook,

}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { 
    dbus

    glib

    libX11

    libqt5pas

    libqtpas

  ];



  env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}";

pkgs/by-name/la/lazpaint/package.nix

+6 −7
Original line number Diff line number Diff line
@@ -2,11 +2,10 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  lazarus-qt,

  lazarus-qt5,

  fpc,

  autoPatchelfHook,

  libsForQt5,

  libqt5pas,

  xorg,

  python3,

}:
@@ -37,15 +36,15 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [

    lazarus-qt

    lazarus-qt5

    fpc

    libsForQt5.wrapQtAppsHook

    autoPatchelfHook

  ];



  buildInputs = [

    libsForQt5.qtbase

    libqt5pas

  buildInputs = with libsForQt5; [

    qtbase

    libqtpas

  ];



  runtimeDependencies = [
@@ -63,7 +62,7 @@ stdenv.mkDerivation rec { 
    cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap

    cp -r --no-preserve=mode ${bgracontrols} bgracontrols



    lazbuild --lazarusdir=${lazarus-qt}/share/lazarus \

    lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \

      --build-mode=ReleaseQt5 \

      bgrabitmap/bgrabitmap/bgrabitmappack.lpk \

      bgracontrols/bgracontrols.lpk \

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

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
  fpc,

  lazarus,

  xorg,

  libqt5pas,

  runCommand,

  _7zz,

  archiver,
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    xorg.libX11

    libqt5pas

    libsForQt5.libqtpas

  ];



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

pkgs/by-name/ya/yandex-browser/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
, systemd

, at-spi2-atk

, at-spi2-core

, libqt5pas

, libsForQt5

, qt6

, vivaldi-ffmpeg-codecs

, edition ? "stable"
@@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { 
    nss

    pango

    (lib.getLib stdenv.cc.cc)

    libqt5pas

    libsForQt5.libqtpas

    qt6.qtbase

  ];