1 files changed, 14 insertions, 23 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/radio/direwolf/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/radio/direwolf/default.nix
index aab76574968b..321b103c7f7a 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/radio/direwolf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/radio/direwolf/default.nix
@@ -1,50 +1,41 @@
-{ stdenv, fetchFromGitHub
-, alsaLib, espeak, glibc, gpsd
+{ stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd
 , hamlib, perl, python, udev }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "direwolf";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "wb2osz";
     repo = "direwolf";
     rev = version;
-    sha256 = "1w55dv9xqgc9mpincsj017838vmvdy972fhis3ddskyfvhhzgcsk";
+    sha256 = "0xmz64m02knbrpasfij4rrq53ksxna5idxwgabcw4n2b1ig7pyx5";
   };
 
+  nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     espeak gpsd hamlib perl python
   ] ++ (optionals stdenv.isLinux [alsaLib udev]);
 
-  makeFlags = [ "DESTDIR=$(out)" ];
+  patches = [
+    ./udev-fix.patch
+  ];
 
   postPatch = ''
-    substituteInPlace symbols.c \
+    substituteInPlace src/symbols.c \
       --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
       --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
-    substituteInPlace decode_aprs.c \
+    substituteInPlace src/decode_aprs.c \
       --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
       --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
-    substituteInPlace dwespeak.sh \
+    substituteInPlace scripts/dwespeak.sh \
       --replace espeak ${espeak}/bin/espeak
-  '' + (optionalString stdenv.isLinux ''
-    substituteInPlace Makefile.linux \
-      --replace /usr/include/pthread.h ${stdenv.glibc.dev}/include/pthread.h \
-      --replace /usr/include/alsa ${alsaLib.dev}/include/alsa \
-      --replace /usr/include/gps.h ${gpsd}/include/gps.h \
-      --replace /usr/include/hamlib ${hamlib}/include/hamlib \
-      --replace /usr/include/libudev.h ${udev.dev}/include/libudev.h \
-      --replace /etc/udev $out/etc/udev \
-      --replace 'Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"' "Exec=$out/bin/direwolf" \
-      --replace '#Terminal=true' 'Terminal=true' \
-      --replace 'Path=$(HOME)' '#Path='
-  '');
-
-  preInstall = ''
-    mkdir -p $out/bin
+    substituteInPlace cmake/cpack/direwolf.desktop.in \
+      --replace 'Terminal=false' 'Terminal=true' \
+      --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' \
   '';
 
   meta = {