diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 63ad2df8ab97..44e4b1111ed0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2031,6 +2031,12 @@ githubId = 21687187; name = "Mirza Arnaut"; }; + asappia = { + email = "asappia@gmail.com"; + github = "asappia"; + githubId = 891399; + name = "Alessandro Sappia"; + }; asbachb = { email = "asbachb-nixpkgs-5c2a@impl.it"; matrix = "@asbachb:matrix.org"; diff --git a/pkgs/by-name/vw/vwifi/makefile.patch b/pkgs/by-name/vw/vwifi/makefile.patch new file mode 100644 index 000000000000..8d82129e8e5a --- /dev/null +++ b/pkgs/by-name/vw/vwifi/makefile.patch @@ -0,0 +1,41 @@ +diff --git a/Makefile b/Makefile +index 9430d7e..e46efd3 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,8 +2,10 @@ + # + NAME := vwifi + VERSION := 6.3 +-BINDIR := $(DESTDIR)/usr/local/bin +-MANDIR := $(DESTDIR)/usr/local/man/man1 ++PREFIX ?= $(out) ++DESTDIR ?= $(PREFIX) ++BINDIR ?= $(PREFIX)/bin ++MANDIR ?= $(PREFIX)/share/man/man1 + + EXEC := vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces + #EXEC := vwifi-server vwifi-client vwifi-ctrl vwifi-add-interfaces vwifi-inet-monitor +@@ -23,10 +25,8 @@ MODE+= -O3 -s -Wall -Wextra -pedantic # ////////// RELEASE + + EDITOR ?= geany + +-NETLINK_FLAGS_PATH := /usr/include/libnl3 +-NETLINK_FLAGS := -I $(NETLINK_FLAGS_PATH) +-NETLINK_LIBS_PATH := . +-NETLINK_LIBS := -L $(NETLINK_LIBS_PATH) -lnl-genl-3 -lnl-3 ++NETLINK_FLAGS := $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0) ++NETLINK_LIBS := $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0) + + THREAD_LIBS := -lpthread + +@@ -101,10 +101,6 @@ gitversion: .git + @sed -i "s/^\(VERSION.[^\-]*\)\(-.*\)\?/\1-$(shell git log --pretty=format:"%h" -n 1)/g" Makefile + + install : build +-ifneq ($(EUID),0) +- @echo "Please run 'make install' as root user" +- @exit 1 +-endif + chmod +x $(EXEC) + # Install binaire : + mkdir -p $(BINDIR) && cp -p $(EXEC) $(BINDIR) diff --git a/pkgs/by-name/vw/vwifi/package.nix b/pkgs/by-name/vw/vwifi/package.nix new file mode 100644 index 000000000000..21f40ff19916 --- /dev/null +++ b/pkgs/by-name/vw/vwifi/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libnl, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "vwifi"; + version = "6.3-unstable-2025-02-04"; + src = fetchFromGitHub { + owner = "Raizo62"; + repo = "vwifi"; + rev = "18c320b1b92bea241ad801d05e0f2b4748478fd9"; + hash = "sha256-rlwBO5/xyr8KjvacxYt7dBrV1noXhwBJaElGhmM/eWU="; + }; + + patches = [ ./makefile.patch ]; + + buildInputs = [ + libnl + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + doInstallCheck = true; + + installCheckPhase = '' + checksRan=0 + for bin in $out/bin/vwifi-*; do + echo -n "$(basename -- "$bin"): " + $bin --version 2>&1 | grep -F "${lib.versions.majorMinor finalAttrs.version}" + checksRan=$((checksRan+1)) + done + [ $checksRan -gt 0 ] || exit 1 + ''; + + meta = { + description = "Simulate Wi-Fi (802.11) between Linux Virtual Machines"; + homepage = "https://github.com/Raizo62/vwifi"; + license = lib.licenses.lgpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ asappia ]; + }; +})