From 538627776c5d3c3893760b867db88748a85cfd52 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 9 Jun 2024 19:36:09 +0200 Subject: [PATCH] vfkit: add package; aerospace: remove --- flake.nix | 2 +- packages/aerospace.nix | 43 ------------------------------------------ packages/vfkit.nix | 32 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 44 deletions(-) delete mode 100644 packages/aerospace.nix create mode 100644 packages/vfkit.nix diff --git a/flake.nix b/flake.nix index 4fa9c3f..417da33 100644 --- a/flake.nix +++ b/flake.nix @@ -26,10 +26,10 @@ darwinPackages = if lib.hasSuffix "darwin" system then { - aerospace = callPackage ./packages/aerospace.nix { }; cliclick = callPackage ./packages/cliclick.nix { }; phantomjs = callPackage ./packages/phantomjs.nix { }; tabnine = callPackage ./packages/tabnine { }; + vfkit = callPackage ./packages/vfkit.nix { }; } else { }; in { diff --git a/packages/aerospace.nix b/packages/aerospace.nix deleted file mode 100644 index a953007..0000000 --- a/packages/aerospace.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ pkgs, lib }: - -pkgs.stdenvNoCC.mkDerivation rec { - pname = "aerospace"; - version = "0.11.1-Beta"; - - src = pkgs.fetchurl { - url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - hash = "sha256-HEAHvP3M4UR/pQX/q2nYJZgh3ob5TpIk/TGNQgjD4PY="; - }; - - nativeBuildInputs = with pkgs; [ installShellFiles unzip ]; - - unpackPhase = '' - unzip $src - ''; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/Applications" - OUT_APP="$out/Applications/AeroSpace.app" - cp -r AeroSpace-v${version}/AeroSpace.app "$OUT_APP" - - install -D AeroSpace-v${version}/bin/aerospace $out/bin/aerospace - installManPage AeroSpace-v${version}/manpage/* - - runHook postInstall - ''; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/aerospace --version - ''; - - meta = with lib; { - description = "AeroSpace is an i3-like tiling window manager for macOS"; - homepage = "https://github.com/nikitabobko/AeroSpace"; - license = licenses.mit; - platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/packages/vfkit.nix b/packages/vfkit.nix new file mode 100644 index 0000000..373d520 --- /dev/null +++ b/packages/vfkit.nix @@ -0,0 +1,32 @@ +{ pkgs, lib, ... }: + +# Based on: https://github.com/NixOS/nixpkgs/issues/306179#issuecomment-2119521348 + +pkgs.stdenvNoCC.mkDerivation rec { + pname = "vfkit"; + version = "0.5.1"; + + src = pkgs.fetchurl { + url = "https://github.com/crc-org/vfkit/releases/download/v${version}/vfkit"; + hash = "sha256-at+KsvsKO359d4VUvcSuio2ej5hM6//U4Mj/jqXwhEc="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm755 $src $out/bin/vfkit + + runHook postInstall + ''; + + meta = { + description = "Simple command line tool to start VMs through virtualization framework"; + homepage = "https://github.com/crc-org/vfkit"; + license = lib.licenses.asl20; + platforms = lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + mainProgram = "vfkit"; + }; +}