neard: 0.18 -> 0.19-unstable-2024-07-02

pkgs/servers/neard/default.nix

@@ -1,69 +1,74 @@
 { stdenv
 , lib
-, fetchurl
+, fetchFromGitHub
 , autoreconfHook
 , autoconf-archive
+, gobject-introspection
 , pkg-config
-, systemd
+, wrapGAppsHook3
 , glib
 , dbus
 , libnl
-, python2Packages
+, python3Packages
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "neard";
-  version = "0.18";
+  version = "0.19-unstable-2024-07-02";
 
   outputs = [ "out" "dev" ];
 
-  src = fetchurl {
-    url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz";
-    sha256 = "wBPjEVMV4uEdFrXw8cjOmvvNuiaACq2RJF/ZtKXck4s=";
+  src = fetchFromGitHub {
+    owner = "linux-nfc";
+    repo = "neard";
+    rev = "a0a7d4d677800a39346f0c89d93d0fe43a95efad";
+    hash = "sha256-6BgX7cJwxX+1RX3wU+HY/PIBgzomzOKemnl0SDLJNro=";
   };
 
+  postPatch = ''
+    patchShebangs test/*
+  '';
+
   nativeBuildInputs = [
     autoreconfHook
     autoconf-archive
+    gobject-introspection
     pkg-config
-    python2Packages.wrapPython
+    python3Packages.wrapPython
+    wrapGAppsHook3
+  ];
+
+  dontWrapGApps = true;
+
+  configureFlags = [
+    "--enable-pie"
+    "--enable-test"
+    "--enable-tools"
+    "--with-sysconfdir=/etc"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
   ];
 
   buildInputs = [
-    systemd
-    glib
     dbus
+    glib
     libnl
-  ] ++ (with python2Packages; [
-    python
-  ]);
-
-  pythonPath = with python2Packages; [
-    pygobject2
-    dbus-python
-    pygtk
   ];
 
   strictDeps = true;
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    "--disable-debug"
-    "--enable-tools"
-    "--enable-ese"
-    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+  pythonPath = with python3Packages; [
+    pygobject3
+    dbus-python
   ];
 
-  postInstall = ''
-    install -m 0755 tools/snep-send $out/bin/
+  doCheck = true;
 
-    install -D -m644 src/main.conf $out/etc/neard/main.conf
-
-    # INFO: the config option "--enable-test" would copy the apps to $out/lib/neard/test/ instead
-    install -d $out/lib/neard
-    install -m 0755 test/* $out/lib/neard/
-    wrapPythonProgramsIn $out/lib/neard "$out $pythonPath"
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    wrapPythonProgramsIn "$out/lib/neard" "$pythonPath"
   '';
 
   meta = with lib; {
@@ -72,7 +77,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = [ ];
     platforms = platforms.unix;
-    # error: wcwidth-0.2.13 not supported for interpreter python2.7
-    broken = true; # Added 2024-03-17
   };
 }