Commit d230e69d authored by OPNA2608's avatar OPNA2608
Browse files

libsForQt5.libqtpas: Rename from libqt5pas

In preparation for a qt6Packages.libqtpas.
parent 62738972
Loading
Loading
Loading
Loading
+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}";

+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}";
+3 −4
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@
  fpc,
  autoPatchelfHook,
  libsForQt5,
  libqt5pas,
  xorg,
  python3,
}:
@@ -43,9 +42,9 @@ stdenv.mkDerivation rec {
    autoPatchelfHook
  ];

  buildInputs = [
    libsForQt5.qtbase
    libqt5pas
  buildInputs = with libsForQt5; [
    qtbase
    libqtpas
  ];

  runtimeDependencies = [
+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}";
+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
  ];

Loading