From 85deea129aeaecc02b8d1e3b99ca69a8065fecb1 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 27 Feb 2023 11:34:06 +0100 Subject: [PATCH] Remove wezterm-unstable --- overlay.nix | 1 - packages.nix | 1 - packages/wezterm-unstable.nix | 86 ----------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 packages/wezterm-unstable.nix diff --git a/overlay.nix b/overlay.nix index 9b29914..a95fc51 100644 --- a/overlay.nix +++ b/overlay.nix @@ -13,5 +13,4 @@ in inherit (custom) phantomjs; inherit (custom) q; inherit (custom) website-docs-nifoc-pw; - inherit (custom) wezterm-unstable; } diff --git a/packages.nix b/packages.nix index 9e3d763..26a2692 100644 --- a/packages.nix +++ b/packages.nix @@ -10,5 +10,4 @@ phantomjs = import ./packages/phantomjs.nix { inherit system lib pkgs; }; q = import ./packages/q.nix { inherit system lib pkgs; }; website-docs-nifoc-pw = import ./packages/website-docs-nifoc-pw.nix { inherit system lib pkgs; }; - wezterm-unstable = import ./packages/wezterm-unstable.nix { inherit system lib pkgs; }; } diff --git a/packages/wezterm-unstable.nix b/packages/wezterm-unstable.nix deleted file mode 100644 index efd653c..0000000 --- a/packages/wezterm-unstable.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ system, lib, pkgs }: - -# Quick and dirty copy of the nixpkgs file: https://github.com/NixOS/nixpkgs/blob/777bc8162088e120fa14638265697fa4394fbe79/pkgs/applications/terminal-emulators/wezterm/default.nix - -pkgs.rustPlatform.buildRustPackage rec { - pname = "wezterm"; - version = "unstable-2023-02-12"; - - src = pkgs.fetchFromGitHub { - owner = "wez"; - repo = pname; - rev = "a5c2b1f3adb06054bf522cb3d350697938d6f8e9"; - fetchSubmodules = true; - sha256 = "sha256-jQK8mSQGBztzSFYNGeL5TP2xUY6Xd4FaLkVvBahpzRY="; - }; - - postPatch = '' - echo ${version} > .tag - # tests are failing with: Unable to exchange encryption keys - rm -r wezterm-ssh/tests - ''; - - cargoSha256 = "sha256-lO9EMhRV6uf85N24vZo/CNcHzl70VFt9CP69enGQnpY="; - - nativeBuildInputs = with pkgs; [ - installShellFiles - ncurses # tic for terminfo - pkg-config - python3 - ] ++ lib.optional stdenv.isDarwin perl; - - buildInputs = with pkgs; [ - fontconfig - zlib - ] ++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ - Cocoa - CoreGraphics - Foundation - libiconv - UserNotifications - ]); - - buildFeatures = [ "distro-defaults" ]; - - postInstall = '' - mkdir -p $out/nix-support - echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages - install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png - install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop - install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml - install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d - installShellCompletion --cmd wezterm \ - --bash assets/shell-completion/bash \ - --fish assets/shell-completion/fish \ - --zsh assets/shell-completion/zsh - install -Dm644 assets/wezterm-nautilus.py -t $out/share/nautilus-python/extensions - ''; - - preFixup = lib.optionalString pkgs.stdenv.isDarwin '' - mkdir -p "$out/Applications" - OUT_APP="$out/Applications/WezTerm.app" - cp -r assets/macos/WezTerm.app "$OUT_APP" - rm $OUT_APP/*.dylib - cp -r assets/shell-integration/* "$OUT_APP" - ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP" - ''; - - passthru = { - terminfo = pkgs.runCommand "wezterm-terminfo" - { - nativeBuildInputs = with pkgs; [ - ncurses - ]; - } '' - mkdir -p $out/share/terminfo $out/nix-support - tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo - ''; - }; - - meta = with lib; { - description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; - homepage = "https://wezfurlong.org/wezterm"; - license = licenses.mit; - platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - }; -}