diff --git a/pkgs/by-name/up/upp/package.nix b/pkgs/by-name/up/upp/package.nix index 26f686a..dbe9700 100644 --- a/pkgs/by-name/up/upp/package.nix +++ b/pkgs/by-name/up/upp/package.nix @@ -2,6 +2,7 @@ lib, callPackage, fetchFromGitHub, + fetchpatch, makeWrapper, pkg-config, stdenv, @@ -68,7 +69,11 @@ in { patches = [ ./no-build-info.patch - ./remove-inline-from-HighlightSetup-InitOnce.patch + (fetchpatch { + # https://github.com/ultimatepp/ultimatepp/pull/271 + url = "https://github.com/ultimatepp/ultimatepp/commit/db5cad68673f9571e6571116e0570e22e3e44fe8.patch"; + hash = "sha256-t2PducjE6b5MjDSAIKvEMdHnT8oTGmI073qYuhLFCh0="; + }) ]; postPatch = '' patchShebangs ./configure_makefile diff --git a/pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch b/pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch deleted file mode 100644 index 1d86a43..0000000 --- a/pkgs/by-name/up/upp/remove-inline-from-HighlightSetup-InitOnce.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a b -index eca1b54..dede1d5 100644 ---- a/uppsrc/CodeEditor/Style.cpp -+++ b/uppsrc/CodeEditor/Style.cpp -@@ -38,7 +38,7 @@ void HighlightSetup::DefaultHlStyles() - WhiteTheme(); - } - --inline void HighlightSetup::InitOnce() -+void HighlightSetup::InitOnce() - { - ONCELOCK { - static bool initialised;