about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStig <stig@stig.io>2023-08-18 00:27:06 +0200
committerGitHub <noreply@github.com>2023-08-18 00:27:06 +0200
commitef8288935ba859fc3b30632fa6e04705f81b9c2a (patch)
treef5a95213a097b73df9d76855ed69477a10203da5
parent95adce84aa59db2300ce3250cab00ece8394f30f (diff)
parent4a49e797081d4505018f0500367b51e3dc407ee2 (diff)
Merge pull request #249166 from arcnmx/perl538-fallout-urxvt
rxvt-unicode: patch to support perl 5.38
-rw-r--r--pkgs/applications/terminal-emulators/rxvt-unicode/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index 47cd84d948252..e932fcdea05f3 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -73,7 +73,12 @@ stdenv.mkDerivation {
     ./patches/9.06-font-width.patch
   ]) ++ [
     ./patches/256-color-resources.patch
-  ]++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
+  ] ++ optional (perlSupport && versionAtLeast perl.version "5.38") (fetchpatch {
+    name = "perl538-locale-c.patch";
+    url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch";
+    excludes = [ "Changes" ];
+    sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM=";
+  }) ++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
 
   configureFlags = [
     "--with-terminfo=${placeholder "terminfo"}/share/terminfo"