diff options
author | Nikolay Korotkiy <sikmir@disroot.org> | 2023-11-19 01:22:50 +0400 |
---|---|---|
committer | Nikolay Korotkiy <sikmir@disroot.org> | 2023-11-19 01:23:10 +0400 |
commit | fdd16da0bb94f570f950f9bd0b19671171658f1a (patch) | |
tree | fb7d7ead6b8d1fc06c3321dfb14a47e0400b8d87 /pkgs/applications | |
parent | de8a49ee22c4e1946f56c8bc3aa5088b3753bb28 (diff) |
cudatext: fix patch
Fixes #262783
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/cudatext/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/editors/cudatext/proc_globdata.patch | 30 |
2 files changed, 34 insertions, 3 deletions
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 7ea83aa234615..ad67837b38920 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -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 ] diff --git a/pkgs/applications/editors/cudatext/proc_globdata.patch b/pkgs/applications/editors/cudatext/proc_globdata.patch new file mode 100644 index 0000000000000..b89476bb5fcbc --- /dev/null +++ b/pkgs/applications/editors/cudatext/proc_globdata.patch @@ -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; |