From 132e985a52c0d5441b757add290bd1bbb59386cf Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 8 Jun 2023 18:26:56 -0400 Subject: [PATCH] packages: Use waycorner from nixpkgs/master --- packages/waycorner/default.nix | 40 ---------------------------------- src/main.nix | 3 ++- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 packages/waycorner/default.nix diff --git a/packages/waycorner/default.nix b/packages/waycorner/default.nix deleted file mode 100644 index 2ff71ea..0000000 --- a/packages/waycorner/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - makeWrapper, - rustPlatform, - pkg-config, - fetchFromGitHub, - wayland, -}: -rustPlatform.buildRustPackage rec { - pname = "waycorner"; - version = "0.2.1"; - src = fetchFromGitHub { - owner = "AndreasBackx"; - repo = "waycorner"; - rev = version; - hash = "sha256-xvmvtn6dMqt8kUwvn5d5Nl1V84kz1eWa9BSIN/ONkSQ="; - }; - cargoHash = "sha256-Dl+GhJywWhaC4QMS70klazPsFipGVRW+6jrXH2XsEAI="; - buildInputs = [ - wayland - ]; - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - postFixup = '' - # the program looks for libwayland-client.so at runtime - wrapProgram $out/bin/waycorner \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [wayland]} - ''; - - meta = with lib; { - description = "Hot corners for Wayland"; - changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md"; - homepage = "https://github.com/AndreasBackx/waycorner"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [NotAShelf]; - }; -} diff --git a/src/main.nix b/src/main.nix index 22de736..702b95e 100644 --- a/src/main.nix +++ b/src/main.nix @@ -5,6 +5,7 @@ nix-gaming, crystal-flake, nixpkgs-hyprland-autoname-workspaces, + nixpkgs-master, ... }: let VARIABLES = import ./variables.nix; @@ -62,7 +63,7 @@ in { ameba crystal-flake.packages.${VARIABLES.system}.crystal crystal-flake.packages.${VARIABLES.system}.crystalline - (pkgs.callPackage ../packages/waycorner {}) + nixpkgs-master.legacyPackages.${VARIABLES.system}.waycorner (pkgs.callPackage ../packages/srb2 {}) slade typespeed