4 files changed, 22 insertions, 34 deletions

diff --git a/overlays/pidgin.nix b/overlays/pidgin.nix
index d346c7a1..3c9fb93c 100644
--- a/overlays/pidgin.nix
+++ b/overlays/pidgin.nix
@@ -4,8 +4,29 @@ let
     url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch";
     sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44";
   };
+
+  pidginWrapper = { symlinkJoin, pidgin, makeWrapper, plugins }:
+    let
+      extraArgs = map (x: x.wrapArgs or "") plugins;
+      majorVersion = prev.lib.versions.major pidgin.version;
+    in symlinkJoin {
+      name = "pidgin-with-plugins-${pidgin.version}";
+
+      paths = [ pidgin ] ++ plugins;
+
+      buildInputs = [ makeWrapper ];
+
+      postBuild = ''
+        wrapProgram $out/bin/pidgin \
+          --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion} $out/lib/pidgin" \
+          ${toString extraArgs}
+        wrapProgram $out/bin/finch \
+          --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion}" \
+          ${toString extraArgs}
+      '';
+    };
 in {
-  pidgin-with-plugins = import (/. + prev.path + "/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix") {
+  pidgin-with-plugins = pidginWrapper {
     inherit (prev) makeWrapper symlinkJoin;
     plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts ];
     pidgin = prev.pidgin.overrideAttrs (oldAttrs: {
diff --git a/overlays/udp2raw/default.nix b/overlays/udp2raw/default.nix
deleted file mode 100644
index b08bdf4b..00000000
--- a/overlays/udp2raw/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-final: prev: {
-  udp2raw = final.callPackage ./package.nix {};
-}
diff --git a/overlays/udp2raw/package.nix b/overlays/udp2raw/package.nix
deleted file mode 100644
index 6612ac3e..00000000
--- a/overlays/udp2raw/package.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgsMusl, fetchFromGitHub }:
-pkgsMusl.stdenv.mkDerivation rec {
-  pname = "udp2raw";
-  version = "20200818.0";
-
-  src = fetchFromGitHub {
-    repo = "udp2raw-tunnel";
-    owner = "wangyu-";
-    rev = version;
-    hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8=";
-  };
-  patches = [ ./udp2raw-makefile.patch ];
-  configurePhase = "";
-  buildPhase = ''
-    make cc_amd64=''${CXX} amd64_hw_aes
-  '';
-  installPhase = ''
-    install -Dm755 udp2raw_amd64_hw_aes $out/bin/udp2raw
-  '';
-}
diff --git a/overlays/udp2raw/udp2raw-makefile.patch b/overlays/udp2raw/udp2raw-makefile.patch
deleted file mode 100644
index 264f5cf4..00000000
--- a/overlays/udp2raw/udp2raw-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/makefile b/makefile
-index 22c07ae..ddcfbc4 100755
---- a/makefile
-+++ b/makefile
-@@ -131,4 +131,4 @@ clean:
-        rm -f git_version.h
- 
- git_version:
--           echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > git_version.h
-+           echo "const char *gitversion = \"cc6ea766c495cf4c69d1c7485728ba022b0f19de\";" > git_version.h