Unverified Commit fdd16da0 authored by Nikolay Korotkiy's avatar Nikolay Korotkiy
Browse files

cudatext: fix patch

Fixes #262783
parent de8a49ee
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -47,11 +47,12 @@ stdenv.mkDerivation rec {
    hash = "sha256-ke7i0eeZHEsVhtzaS0AeLQOrYE1F+ppCwjR2TWeJQPA=";
  };

  patches = [ ./proc_globdata.patch ];

  postPatch = ''
    substituteInPlace app/proc_globdata.pas \
      --replace "/usr/share/cudatext" "$out/share/cudatext" \
      --replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so" \
      --replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;"
      --subst-var out \
      --subst-var-by python3 ${python3}
  '';

  nativeBuildInputs = [ lazarus fpc ]
+30 −0
Original line number Diff line number Diff line
diff --git i/app/proc_globdata.pas w/app/proc_globdata.pas
index d161b09c7..0fcfbdc09 100644
--- i/app/proc_globdata.pas
+++ w/app/proc_globdata.pas
@@ -1342,6 +1342,7 @@ begin
 
   {$ifdef unix}
   for Dir in [
+              '@python3@/lib',
               '/usr/lib64',
               '/usr/lib',
               '/usr/lib/x86_64-linux-gnu'
@@ -1364,7 +1365,7 @@ var
 function GetDirPrecopy: string;
 begin
   {$ifdef linux}
-  exit('/usr/share/cudatext');
+  exit('@out@/share/cudatext');
   {$endif}
 
   {$ifdef darwin}
@@ -2056,7 +2057,7 @@ begin
     FindWrapAtEdge_Delay:= 350;
     FindWrapAtEdge_ThemeItem:= ''; //'EdMarkedRangeBg';
 
-    AllowProgramUpdates:= true;
+    AllowProgramUpdates:= false;
     EscapeClose:= false;
     EscapeCloseConsole:= true;
     EscapeCloseFinder:= true;