Unverified Commit 9d67a1f6 authored by Magnus Bergmark's avatar Magnus Bergmark
Browse files

rofi-emoji: Split into v4 and v3 versions 

https://github.com/Mange/rofi-emoji/releases/tag/v4.0.0

rofi-emoji now has two branches, one for the stable release of Rofi and
another for the unstable unreleased version of Rofi. A lot of Rofi forks
are based on this unstable branch, which causes some issues for users.

Having the latest release available should be helpful for those users.

The default named `rofi-emoji` version is version 3, which builds
against the current version of the `rofi` pkg.

The other version is exposed as `rofi-emoji-wayland` and is built with
version 4 against the `rofi-wayland` fork.

Other changes:

- Add Mange as maintainer.
- Update 3.4.0 to 3.4.1.
- Stop requiring xsel.
- Only require xclip with X11 support enabled.
- Only require wl-clipboard with Wayland support enabled.
parent ff60f2ca

pkgs/applications/misc/rofi-emoji/default.nix

+43 −46
Original line number Diff line number Diff line
@@ -15,26 +15,23 @@ 
, rofi-unwrapped

, wl-clipboard

, xclip

, xsel

, xdotool

, wtype

}:



import ./versions.nix ({ version, hash, patches}:

  stdenv.mkDerivation rec {

    pname = "rofi-emoji";

  version = "3.4.0";

    inherit version;



    src = fetchFromGitHub {

      owner = "Mange";

    repo = pname;

      repo = "rofi-emoji";

      rev = "v${version}";

    hash = "sha256-tF3yAKRUix+if+45rxg5vq83Pu33TQ6oUKWPIs/l4X0=";

      inherit hash;

    };



  patches = [

    # Look for plugin-related files in $out/lib/rofi

    ./0001-Patch-plugindir-to-output.patch

  ];

    inherit patches;



    postPatch = ''

      patchShebangs clipboard-adapter.sh
@@ -43,9 +40,9 @@ stdenv.mkDerivation rec { 
    postFixup = ''

      chmod +x $out/share/rofi-emoji/clipboard-adapter.sh

      wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \

     --prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ]

       ++ lib.optionals waylandSupport [ wtype ]

       ++ lib.optionals x11Support [ xdotool ])}

       --prefix PATH ":" ${lib.makeBinPath ([ libnotify ]

         ++ lib.optionals waylandSupport [ wl-clipboard wtype ]

         ++ lib.optionals x11Support [ xclip xdotool ])}

    '';
@@ -60,16 +57,16 @@ stdenv.mkDerivation rec { 
      glib

      libnotify

      rofi-unwrapped

    wl-clipboard

    xclip

    xsel

  ];

    ]

      ++ lib.optionals waylandSupport [ wl-clipboard wtype ]

      ++ lib.optionals x11Support [ xclip ];



    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";

      license = licenses.mit;

    maintainers = with maintainers; [ cole-h ];

      maintainers = with maintainers; [ cole-h Mange ];

      platforms = platforms.linux;

    };

  }

)

pkgs/applications/misc/rofi-emoji/versions.nix

0 → 100644
+18 −0
Original line number Diff line number Diff line 
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

    ];

  };

}

pkgs/top-level/all-packages.nix

+6 −1
Original line number Diff line number Diff line
@@ -32469,7 +32469,12 @@ with pkgs; 














  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 { };