mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
Merge pull request #329531 from Mange/rofi-emoji-split
rofi-emoji: 3.4.0 -> 3.4.1 + 4.0.0 / rofi-emoji-wayland
This commit is contained in:
commit
f97c714221
|
@ -12400,6 +12400,13 @@
|
||||||
githubId = 115060;
|
githubId = 115060;
|
||||||
name = "Marek Maksimczyk";
|
name = "Marek Maksimczyk";
|
||||||
};
|
};
|
||||||
|
Mange = {
|
||||||
|
name = "Magnus Bergmark";
|
||||||
|
email = "me@mange.dev";
|
||||||
|
github = "Mange";
|
||||||
|
githubId = 1599;
|
||||||
|
keys = [ { fingerprint = "2EA6 F4AA 110A 1BF2 2275 19A9 0443 C69F 6F02 2CDE"; } ];
|
||||||
|
};
|
||||||
mangoiv = {
|
mangoiv = {
|
||||||
email = "contact@mangoiv.com";
|
email = "contact@mangoiv.com";
|
||||||
github = "mangoiv";
|
github = "mangoiv";
|
||||||
|
|
|
@ -15,61 +15,58 @@
|
||||||
, rofi-unwrapped
|
, rofi-unwrapped
|
||||||
, wl-clipboard
|
, wl-clipboard
|
||||||
, xclip
|
, xclip
|
||||||
, xsel
|
|
||||||
, xdotool
|
, xdotool
|
||||||
, wtype
|
, wtype
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
import ./versions.nix ({ version, hash, patches}:
|
||||||
pname = "rofi-emoji";
|
stdenv.mkDerivation rec {
|
||||||
version = "3.4.0";
|
pname = "rofi-emoji";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Mange";
|
owner = "Mange";
|
||||||
repo = pname;
|
repo = "rofi-emoji";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-tF3yAKRUix+if+45rxg5vq83Pu33TQ6oUKWPIs/l4X0=";
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
inherit patches;
|
||||||
# Look for plugin-related files in $out/lib/rofi
|
|
||||||
./0001-Patch-plugindir-to-output.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs clipboard-adapter.sh
|
patchShebangs clipboard-adapter.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
|
chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
|
||||||
wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
|
wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
|
||||||
--prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ]
|
--prefix PATH ":" ${lib.makeBinPath ([ libnotify ]
|
||||||
++ lib.optionals waylandSupport [ wtype ]
|
++ lib.optionals waylandSupport [ wl-clipboard wtype ]
|
||||||
++ lib.optionals x11Support [ xdotool ])}
|
++ lib.optionals x11Support [ xclip xdotool ])}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
makeWrapper
|
makeWrapper
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cairo
|
cairo
|
||||||
glib
|
glib
|
||||||
libnotify
|
libnotify
|
||||||
rofi-unwrapped
|
rofi-unwrapped
|
||||||
wl-clipboard
|
]
|
||||||
xclip
|
++ lib.optionals waylandSupport [ wl-clipboard wtype ]
|
||||||
xsel
|
++ lib.optionals x11Support [ xclip ];
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Emoji selector plugin for Rofi";
|
description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})";
|
||||||
homepage = "https://github.com/Mange/rofi-emoji";
|
homepage = "https://github.com/Mange/rofi-emoji";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ cole-h ];
|
maintainers = with maintainers; [ cole-h Mange ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
|
18
pkgs/applications/misc/rofi-emoji/versions.nix
Normal file
18
pkgs/applications/misc/rofi-emoji/versions.nix
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
generic: {
|
||||||
|
v4 = generic {
|
||||||
|
version = "4.0.0";
|
||||||
|
hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
|
||||||
|
patches = [
|
||||||
|
# Look for plugin-related files in $out/lib/rofi
|
||||||
|
./0001-Patch-plugindir-to-output.patch
|
||||||
|
];
|
||||||
|
};
|
||||||
|
v3 = generic {
|
||||||
|
version = "3.4.1";
|
||||||
|
hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0=";
|
||||||
|
patches = [
|
||||||
|
# Look for plugin-related files in $out/lib/rofi
|
||||||
|
./0001-Patch-plugindir-to-output.patch
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -32292,7 +32292,12 @@ with pkgs;
|
||||||
|
|
||||||
rofi-calc = callPackage ../applications/science/math/rofi-calc { };
|
rofi-calc = callPackage ../applications/science/math/rofi-calc { };
|
||||||
|
|
||||||
rofi-emoji = callPackage ../applications/misc/rofi-emoji { };
|
rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
|
||||||
|
rofi-emoji-wayland = (
|
||||||
|
callPackage ../applications/misc/rofi-emoji {
|
||||||
|
rofi-unwrapped = rofi-wayland-unwrapped;
|
||||||
|
}
|
||||||
|
).v4;
|
||||||
|
|
||||||
rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };
|
rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue