From 190bcab7f8fb0676c4896ca6de4f9fab25398dbb Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 11 Jul 2024 17:18:39 -0400 Subject: [PATCH] packages: Remove upstreamed hyprland plugins Now in nixpkgs. --- packages/hycov.nix | 29 ----------------- packages/hypr-dynamic-cursors.nix | 44 -------------------------- packages/hyprfocus.nix | 42 ------------------------- packages/hyprgrass.nix | 43 ------------------------- packages/hyprscroller.nix | 44 -------------------------- packages/hyprspace.nix | 51 ------------------------------ packages/wf-touch.nix | 52 ------------------------------- 7 files changed, 305 deletions(-) delete mode 100644 packages/hycov.nix delete mode 100644 packages/hypr-dynamic-cursors.nix delete mode 100644 packages/hyprfocus.nix delete mode 100644 packages/hyprgrass.nix delete mode 100644 packages/hyprscroller.nix delete mode 100644 packages/hyprspace.nix delete mode 100644 packages/wf-touch.nix diff --git a/packages/hycov.nix b/packages/hycov.nix deleted file mode 100644 index b0b18865..00000000 --- a/packages/hycov.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, hyprland -, fetchFromGitHub -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hycov"; - version = "0.41.2.1"; - - src = fetchFromGitHub { - owner = "DreamMaoMao"; - repo = "hycov"; - rev = finalAttrs.version; - hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ="; - }; - - inherit (hyprland) nativeBuildInputs; - - buildInputs = [ hyprland ] ++ hyprland.buildInputs; - - meta = { - description = "Clients overview for hyprland plugin"; - homepage = "https://github.com/DreamMaoMao/hycov"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/packages/hypr-dynamic-cursors.nix b/packages/hypr-dynamic-cursors.nix deleted file mode 100644 index 7ea365e9..00000000 --- a/packages/hypr-dynamic-cursors.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, hyprland -, pkg-config -}: - -stdenv.mkDerivation { - pname = "hypr-dynamic-cursors"; - version = "0-unstable-2024-07-06"; - - src = fetchFromGitHub { - owner = "VirtCode"; - repo = "hypr-dynamic-cursors"; - rev = "85423b074e112f28e84f6276d31d1548906a625e"; - hash = "sha256-lCAZ/7xtOE6P7uPIX2uQgC0nDOBZefWYO3O3izRx19E="; - }; - - nativeBuildInputs = [ - pkg-config - hyprland - ]; - - buildInputs = [ hyprland ] ++ hyprland.buildInputs; - - dontUseCmakeConfigure = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - mv out/dynamic-cursors.so $out/lib/libdynamic-cursors.so - - runHook postInstall - ''; - - meta = { - description = "Plugin to make your Hyprland cursor more realistic"; - homepage = "https://github.com/VirtCode/hypr-dynamic-cursors"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.linux; - }; -} diff --git a/packages/hyprfocus.nix b/packages/hyprfocus.nix deleted file mode 100644 index 3a2306f4..00000000 --- a/packages/hyprfocus.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, hyprland -, pkg-config -}: - -stdenv.mkDerivation { - pname = "hyprfocus"; - version = "0-unstable-2024-05-30"; - - src = fetchFromGitHub { - owner = "pyt0xic"; - repo = "hyprfocus"; - rev = "aa7262d3a4564062f97b9cfdad47fd914cfb80f2"; - hash = "sha256-R1ZgNhQkoS6ZHRRKB+j5vYgRANfYO//sHbrD7moUTx0="; - }; - - nativeBuildInputs = [ - pkg-config - hyprland - ]; - - buildInputs = [ hyprland ] ++ hyprland.buildInputs; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - mv hyprfocus.so $out/lib/libhyprfocus.so - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/pyt0xic/hyprfocus"; - description = "Focus animation plugin for Hyprland inspired by Flashfocus"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.linux; - }; -} diff --git a/packages/hyprgrass.nix b/packages/hyprgrass.nix deleted file mode 100644 index 019bc243..00000000 --- a/packages/hyprgrass.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, hyprland -, fetchFromGitHub -, callPackage -, doctest -}: - -let - wf-touch = callPackage ./wf-touch.nix { }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "hyprgrass"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "horriblename"; - repo = "hyprgrass"; - rev = "v${finalAttrs.version}"; - hash = "sha256-DfM2BqnFW48NlHkBfC7ErHgK7WHlOgiiE+aFetN/yJ4="; - }; - - nativeBuildInputs = [ - doctest - ] ++ hyprland.nativeBuildInputs; - - buildInputs = [ - hyprland - wf-touch - ] ++ hyprland.buildInputs; - - dontUseCmakeConfigure = true; - - doCheck = true; - - meta = { - description = "Hyprland plugin for touch gestures"; - homepage = "https://github.com/horriblename/hyprgrass"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/packages/hyprscroller.nix b/packages/hyprscroller.nix deleted file mode 100644 index d52569e8..00000000 --- a/packages/hyprscroller.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, hyprland -, pkg-config -, cmake -}: - -stdenv.mkDerivation { - pname = "hyprscroller"; - version = "0-unstable-2024-07-04"; - - src = fetchFromGitHub { - owner = "dawsers"; - repo = "hyprscroller"; - rev = "bef840b3f0fd3d37b5c1c9f2704b2efb60173184"; - hash = "sha256-vkpGSseA7n0/Y+83snbEe7Z++2akdDbvv7eZzM9V3wI="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - hyprland - ]; - - buildInputs = [ hyprland ] ++ hyprland.buildInputs; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - mv hyprscroller.so $out/lib/libhyprscroller.so - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/dawsers/hyprscroller"; - description = "Hyprland layout plugin providing a scrolling layout like PaperWM"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.linux; - }; -} diff --git a/packages/hyprspace.nix b/packages/hyprspace.nix deleted file mode 100644 index 8dab0ace..00000000 --- a/packages/hyprspace.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, hyprland -, pkg-config -}: - -stdenv.mkDerivation { - pname = "hyprspace"; - version = "0-unstable-2024-06-17"; - - src = fetchFromGitHub { - owner = "KZDKM"; - repo = "hyprspace"; - rev = "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7"; - hash = "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8="; - }; - - # Fix build on Hyprland v0.41.2 - patches = fetchpatch { - url = "https://github.com/KZDKM/Hyprspace/commit/edad6cf735097b7cb4406d3fc8daddd09dfa458a.patch"; - hash = "sha256-EVabjPymGAMPtC3Uf6lMJOInvccJhu4t09NXhXhq4RY="; - }; - - nativeBuildInputs = [ - pkg-config - hyprland - ]; - - buildInputs = [ hyprland ] ++ hyprland.buildInputs; - - dontUseCmakeConfigure = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - mv Hyprspace.so $out/lib/libhyprspace.so - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/KZDKM/Hyprspace"; - description = "Workspace overview plugin for Hyprland"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ donovanglover ]; - }; -} diff --git a/packages/wf-touch.nix b/packages/wf-touch.nix deleted file mode 100644 index 212723d1..00000000 --- a/packages/wf-touch.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, pkg-config -, meson -, cmake -, ninja -, glm -, doctest -}: - -stdenv.mkDerivation { - pname = "wf-touch"; - version = "0-unstable-2021-03-19"; - - src = fetchFromGitHub { - owner = "WayfireWM"; - repo = "wf-touch"; - rev = "8974eb0f6a65464b63dd03b842795cb441fb6403"; - hash = "sha256-MjsYeKWL16vMKETtKM5xWXszlYUOEk3ghwYI85Lv4SE="; - }; - - nativeBuildInputs = [ - meson - pkg-config - cmake - ninja - ]; - - buildInputs = [ doctest ]; - - propagatedBuildInputs = [ glm ]; - - mesonBuildType = "release"; - - # Patch wf-touch to generate pkgconfig - patches = fetchpatch { - url = "https://raw.githubusercontent.com/horriblename/hyprgrass/736119f828eecaed2deaae1d6ff1f50d6dabaaba/nix/wf-touch.patch"; - hash = "sha256-3YK5YnO0NCwshs1reJFjJ9tIEhTNSS0fPWUDFo3XA3s="; - }; - - outputs = [ "out" "dev" ]; - - meta = { - description = "Touchscreen gesture library"; - homepage = "https://github.com/WayfireWM/wf-touch"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.all; - }; -}