cudatext: fix patch

Fixes #262783
This commit is contained in:
Nikolay Korotkiy 2023-11-19 01:22:50 +04:00
parent de8a49ee22
commit fdd16da0bb
No known key found for this signature in database
GPG Key ID: D1DE6D7F693663A5
2 changed files with 34 additions and 3 deletions

View File

@ -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 ]

View File

@ -0,0 +1,30 @@
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;