From e5e5c1cc994ce9d2871707ec2e1eeea1a012cf2b Mon Sep 17 00:00:00 2001 From: hashirama Date: Fri, 28 Jun 2024 22:56:08 -0400 Subject: [PATCH] rebase --- use_xsel.patch | 54 +++++++++++++------------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) diff --git a/use_xsel.patch b/use_xsel.patch index f6b089f..4beb6a1 100644 --- a/use_xsel.patch +++ b/use_xsel.patch @@ -1,40 +1,14 @@ -9,26c9,16 -< local self = { healthy = true, clip_util = "", clip_cmd = "", } -< -< if h.is_mac() then -< self.clip_util = "pbcopy" -< self.clip_cmd = "LANG=en_US.UTF-8 " .. self.clip_util -< elseif h.is_wayland() then -< local function is_wl_copy_installed() -< local handle = h.subprocess { 'wl-copy', '--version' } -< return handle.status == 0 and handle.stdout:match("wl%-clipboard") ~= nil -< end -< -< self.clip_util = "wl-copy" -< self.clip_cmd = self.clip_util -< self.healthy = is_wl_copy_installed() -< else -< local function is_xclip_installed() -< local handle = h.subprocess { 'xclip', '-version' } -< return handle.status == 0 and handle.stderr:match("xclip version") ~= nil ---- -> local self = {} -> local clip = (function() -> if h.is_mac() then -> return 'LANG=en_US.UTF-8 pbcopy' -> elseif h.is_wayland() then -> return 'wl-copy' -> else -> return 'xsel --input --clipboard' -28,32c18 -< -< self.clip_util = "xclip" -< self.clip_cmd = self.clip_util .. " -i -selection clipboard" -< self.healthy = is_xclip_installed() -< end ---- -> end)() -39c25 -< local handle = io.popen(self.clip_cmd, 'w') ---- -> local handle = io.popen(clip, 'w') +diff -urN ../mpvacious/platform/nix.lua ../mpvacious-patch/platform/nix.lua +--- ../mpvacious/platform/nix.lua 2024-06-28 22:39:00.110717010 -0400 ++++ ../mpvacious-patch/platform/nix.lua 2024-06-28 22:51:09.477937080 -0400 +@@ -26,8 +26,8 @@ + return handle.status == 0 and handle.stderr:match("xclip version") ~= nil + end + +- self.clip_util = "xclip" +- self.clip_cmd = self.clip_util .. " -i -selection clipboard" ++ self.clip_util = "xsel" ++ self.clip_cmd = self.clip_util .. " --input --clipboard" + self.healthy = is_xclip_installed() + end +