Commit c39894d8 authored by OPNA2608's avatar OPNA2608
Browse files

lazarus-qt6: init at 3.6-0

parent 542c24ca

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

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  lazarus-qt,

  lazarus-qt5,

  fpc,

  autoPatchelfHook,

  libsForQt5,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [

    lazarus-qt

    lazarus-qt5

    fpc

    libsForQt5.wrapQtAppsHook

    autoPatchelfHook
@@ -62,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/development/compilers/fpc/lazarus.nix

+3 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ let 
    )

  );



  qtVersion = lib.versions.major qtbase.version;

in

stdenv.mkDerivation rec {

  pname = "lazarus-${LCL_PLATFORM}";
@@ -94,7 +95,7 @@ stdenv.mkDerivation rec { 
    "bigide"

  ];



  LCL_PLATFORM = if withQt then "qt5" else "gtk2";

  LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2";



  NIX_LDFLAGS = lib.concatStringsSep " " (

    [
@@ -114,7 +115,7 @@ stdenv.mkDerivation rec { 
    ]

    ++ lib.optionals withQt [

      "-L${lib.getLib libqtpas}/lib"

      "-lQt5Pas"

      "-lQt${qtVersion}Pas"

    ]

  );

pkgs/tools/graphics/goverlay/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  stdenv,

  fetchFromGitHub,

  fpc,

  lazarus-qt,

  lazarus-qt5,

  wrapQtAppsHook,

  breeze-qt5,

  libGL,
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [

    fpc

    lazarus-qt

    lazarus-qt5

    wrapQtAppsHook

  ];
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec { 


  buildPhase = ''

    runHook preBuild

    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt}/share/lazarus -B goverlay.lpi

    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus -B goverlay.lpi

    runHook postBuild

  '';

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ mapAliases { 
  LASzip2 = laszip_2; # Added 2024-06-12

  latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04

  latinmodern-math = lmmath;

  lazarus-qt = lazarus-qt5; # Added 2024-12-25

  leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19

  ledger_agent = ledger-agent; # Added 2024-01-07

  lfs = dysk; # Added 2023-07-03

pkgs/top-level/all-packages.nix

+6 −1
Original line number Diff line number Diff line
@@ -6525,7 +6525,12 @@ with pkgs; 
    fpc = fpc;

  };













  lazarus-qt = libsForQt5.callPackage ../development/compilers/fpc/lazarus.nix {













  lazarus-qt5 = libsForQt5.callPackage ../development/compilers/fpc/lazarus.nix {













    fpc = fpc;













    withQt = true;













  };

























  lazarus-qt6 = qt6Packages.callPackage ../development/compilers/fpc/lazarus.nix {















    fpc = fpc;















    withQt = true;















  };