From e6070d1e084df2baeb2e2d028b71f86888d57a26 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 16 Feb 2021 00:27:54 -0300 Subject: [PATCH] wl-clipboard: rename from tools/misc to tools/wayland --- .../{misc => wayland}/wl-clipboard/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) rename pkgs/tools/{misc => wayland}/wl-clipboard/default.nix (86%) diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix similarity index 86% rename from pkgs/tools/misc/wl-clipboard/default.nix rename to pkgs/tools/wayland/wl-clipboard/default.nix index 676ff03ad9b..0c94e98335f 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/wayland/wl-clipboard/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config -, wayland, wayland-protocols }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +, wayland-protocols +}: stdenv.mkDerivation rec { pname = "wl-clipboard"; @@ -16,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ wayland ]; meta = with lib; { - description = "Command-line copy/paste utilities for Wayland"; homepage = "https://github.com/bugaevc/wl-clipboard"; + description = "Command-line copy/paste utilities for Wayland"; license = licenses.gpl3; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a07b8155a4..b30769eb21b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1972,6 +1972,8 @@ in wev = callPackage ../tools/wayland/wev { }; + wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; + clipster = callPackage ../tools/misc/clipster { }; contrast = callPackage ../applications/accessibility/contrast { }; @@ -3858,8 +3860,6 @@ in wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; - wlsunset = callPackage ../tools/wayland/wlsunset { }; wob = callPackage ../tools/misc/wob { };