diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index eeb258f48c49..63736ac35e35 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "wayst"; - version = "unstable-2021-04-05"; + version = "unstable-2023-07-16"; src = fetchFromGitHub { owner = "91861"; repo = pname; - rev = "e72ca78ef72c7b1e92473a98d435a3c85d7eab98"; - hash = "sha256-UXAVSfVpk/8KSg4oMw2tVWImD6HqJ7gEioR2MqhUUoQ="; + rev = "f8b218eec1af706fd5ae287f5073e6422eb8b6d8"; + hash = "sha256-tA2R6Snk5nqWkPXSbs7wmovWkT97xafdK0e/pKBUIUg="; }; makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; @@ -56,11 +56,7 @@ stdenv.mkDerivation rec { utf8proc wayland ]; - - # This patch forces the Makefile to use utf8proc - # The makefile relies on ldconfig to find the utf8proc libraries - # which is not possible on nixpkgs - patches = [ ./utf8proc.patch ]; + enableParallelBuilding = true; postPatch = '' substituteInPlace src/settings.c \ diff --git a/pkgs/applications/terminal-emulators/wayst/utf8proc.patch b/pkgs/applications/terminal-emulators/wayst/utf8proc.patch deleted file mode 100644 index 0923c5dbe18d..000000000000 --- a/pkgs/applications/terminal-emulators/wayst/utf8proc.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit caa5a6bed31937f2d1b322da204e11eae57a720f -Author: Nicolas Berbiche -Date: Tue Oct 20 18:14:44 2020 -0400 - - PATCH: use nixpkgs utf8proc - - This patch forces the Makefile to use utf8proc from `buildInputs`. - The Makefile relies on ldconfig to find the utf8proc libraries, - which is not possible with nixpkgs. - -diff --git a/Makefile b/Makefile -index caccdf7..90b11ea 100644 ---- a/Makefile -+++ b/Makefile -@@ -29,7 +29,7 @@ else - LDFLAGS = -O2 -flto - endif - --ifeq ($(shell ldconfig -p | grep libutf8proc.so > /dev/null || echo fail),fail) -+ifeq (false,fail) - $(info libutf8proc not found. Support for language-specific combining characters and unicode normalization will be disabled.) - CFLAGS += -DNOUTF8PROC - else -