summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndersonTorres <torres.anderson.85@protonmail.com>2020-10-09 16:51:19 -0300
committerAndersonTorres <torres.anderson.85@protonmail.com>2020-10-12 04:07:17 -0300
commita0c73419475369d5ba2a2efc724934a2492bcb8c (patch)
tree7b4f52f21c5689f01fff07769f75679273995314
parent70f8c8fc1bb2322eb681630a1150870ffd243266 (diff)
downloadnixpkgs-a0c73419475369d5ba2a2efc724934a2492bcb8c.tar
nixpkgs-a0c73419475369d5ba2a2efc724934a2492bcb8c.tar.gz
nixpkgs-a0c73419475369d5ba2a2efc724934a2492bcb8c.tar.bz2
nixpkgs-a0c73419475369d5ba2a2efc724934a2492bcb8c.tar.lz
nixpkgs-a0c73419475369d5ba2a2efc724934a2492bcb8c.tar.xz
nixpkgs-a0c73419475369d5ba2a2efc724934a2492bcb8c.tar.zst
nixpkgs-a0c73419475369d5ba2a2efc724934a2492bcb8c.zip
a2jmidid: 8 -> 9
-rw-r--r--pkgs/applications/audio/a2jmidid/default.nix40
1 files changed, 13 insertions, 27 deletions
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index f4a9383c29c..98404882892 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -1,38 +1,24 @@
-{ stdenv, fetchurl, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
-, wafHook
-, python2Packages}:
+{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
+, python3Packages , meson, ninja }:
 
-let
-  inherit (python2Packages) python dbus-python;
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "a2jmidid";
-  version = "8";
+  version = "9";
 
-  src = fetchurl {
-    url = "https://github.com/linuxaudio/a2jmidid/archive/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz";
-    sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
+  src = fetchFromGitHub {
+    owner = "linuxaudio";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ=";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper wafHook ];
-  buildInputs = [ alsaLib dbus libjack2 python dbus-python ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/linuxaudio/a2jmidid/commit/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2.diff";
-      sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc";
-    })
-    (fetchpatch {
-      url = "https://github.com/linuxaudio/a2jmidid/commit/7f82da7eb2f540a94db23331be98d42a58ddc269.diff";
-      sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv";
-    })
-    (fetchpatch {
-      url = "https://github.com/linuxaudio/a2jmidid/commit/c07775d021a71cb91bf64ce1391cf525415cb060.diff";
-      sha256 = "172v9hri03qdqi8a3zsg227k5qxldd8v5bj4jk7fyk5jf50fcxga";
-    })
-  ];
+  nativeBuildInputs = [ pkgconfig makeWrapper meson ninja ];
+  buildInputs = [ alsaLib dbus libjack2 ] ++
+                (with python3Packages; [ python dbus-python ]);
 
   postInstall = ''
     wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
+    substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control"
   '';
 
   meta = with stdenv.lib; {