wezterm-git without crane

moni-dz · Aug 22, 2023 · 98bbc81 · 98bbc81
1 parent 98bc3f4
commit 98bbc81
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 129 deletions.
diff --git a/flake.nix b/flake.nix
@@ -2,8 +2,6 @@
   description = "fortuneteller2k's stash of fresh packages";
 
   inputs = {
-    crane.url = "github:ipetkov/crane";
-    rust.url = "github:oxalica/rust-overlay";
     nixpkgs.url = "github:NixOS/nixpkgs/master";
     nixpkgs-fmt.url = "github:nix-community/nixpkgs-fmt";
     parts.url = "github:hercules-ci/flake-parts";

diff --git a/overlays/terminal-emulators.nix b/overlays/terminal-emulators.nix
@@ -2,14 +2,22 @@
 
 {
   flake.overlays.terminal-emulators = _: prev: {
-    wezterm-git =
-      let
-        package = getPackage "wezterm" prev;
-      in
-      prev.darwin.apple_sdk_11_0.callPackage ../pkgs/wezterm {
-        inherit (prev.darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications;
-        inherit (package) src version;
-        crane-lib = inputs.crane.lib.${prev.system}.overrideToolchain inputs.rust.packages.${prev.system}.rust_1_71_0;
+    wezterm-git = prev.darwin.apple_sdk_11_0.callPackage "${inputs.nixpkgs}/pkgs/applications/terminal-emulators/wezterm" {
+      inherit (prev.darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications System;
+
+      rustPlatform = prev.rustPlatform // {
+        buildRustPackage = args: prev.rustPlatform.buildRustPackage (args // rec {
+          inherit (getPackage "wezterm" prev) src version;
+          cargoLock = {
+            lockFile = "${src}/Cargo.lock";
+
+            outputHashes = {
+              "xcb-1.2.1" = "sha256-zkuW5ATix3WXBAj2hzum1MJ5JTX3+uVQ01R1vL6F1rY=";
+              "xcb-imdkit-0.2.0" = "sha256-L+NKD0rsCk9bFABQF4FZi9YoqBHr4VAZeKAWgsaAegw=";
+            };
+          };
+        });
       };
+    };
   };
 }
diff --git a/pkgs/wezterm/default.nix b/pkgs/wezterm/default.nix