summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-02-19 23:50:55 +0100
committerWinter <winter@winter.cafe>2023-02-20 01:16:58 -0500
commitaf260c1e5a5d9dc0fa046343f2151e0fe743495c (patch)
tree86e81cd7098d8d5df017509d2d053df6aec88a84
parent434bb4d090db77c495c1bb2bcf9bb97447b42b0a (diff)
downloadnixpkgs-af260c1e5a5d9dc0fa046343f2151e0fe743495c.tar
nixpkgs-af260c1e5a5d9dc0fa046343f2151e0fe743495c.tar.gz
nixpkgs-af260c1e5a5d9dc0fa046343f2151e0fe743495c.tar.bz2
nixpkgs-af260c1e5a5d9dc0fa046343f2151e0fe743495c.tar.lz
nixpkgs-af260c1e5a5d9dc0fa046343f2151e0fe743495c.tar.xz
nixpkgs-af260c1e5a5d9dc0fa046343f2151e0fe743495c.tar.zst
nixpkgs-af260c1e5a5d9dc0fa046343f2151e0fe743495c.zip
wezterm: fix build against rust 1.67, remove outdated checkFlags
-rw-r--r--pkgs/applications/terminal-emulators/wezterm/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix
index cece7cb8a01..88120c26a17 100644
--- a/pkgs/applications/terminal-emulators/wezterm/default.nix
+++ b/pkgs/applications/terminal-emulators/wezterm/default.nix
@@ -2,6 +2,7 @@
 , rustPlatform
 , lib
 , fetchFromGitHub
+, fetchpatch
 , ncurses
 , perl
 , pkg-config
@@ -40,12 +41,12 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-1gnP2Dn4nkhxelUsXMay2VGvgvMjkdEKhFK5AAST++s=";
   };
 
-  # Rust 1.65 does better at enum packing (according to
-  # 40e08fafe2f6e5b0c70d55996a0814d6813442ef), but Nixpkgs doesn't have 1.65
-  # yet (still in staging), so skip these tests for now.
-  checkFlags = [
-    "--skip=escape::action_size"
-    "--skip=surface::line::storage::test::memory_usage"
+  patches = [
+    # fix build with rust 1.67
+    (fetchpatch {
+      url = "https://github.com/wez/wezterm/commit/36519f0d90e1875fb4b3f11f6cbf94c7d716ef78.patch";
+      sha256 = "sha256-sOGFmDan1uO1xOBCpvlGrSotjfw01MjRg0KVqa5omig=";
+    })
   ];
 
   postPatch = ''