From 837e61e16860abd2f16a9a81684c0f94e4bb5c09 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 1 Jan 2022 12:58:55 -0300 Subject: [PATCH] eudev: 3.2.10 -> 3.2.11 From GitHub. --- pkgs/os-specific/linux/eudev/default.nix | 76 +++++++++++++----------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index b642314737c9..7807f475e9b1 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,60 +1,68 @@ -{lib, stdenv, fetchurl, pkg-config, glib, gperf, util-linux, kmod}: -let - s = # Generated upstream information - rec { - baseName="eudev"; - version = "3.2.10"; - name="${baseName}-${version}"; - url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ="; +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, glib +, gperf +, kmod +, pkg-config +, util-linux +}: + +stdenv.mkDerivation rec { + pname = "eudev"; + version = "3.2.11"; + + src = fetchFromGitHub { + owner = "eudev-project"; + repo = pname; + rev = "v${version}"; + hash = "sha256-W5nL4hicQ4fxz5rqoP+hhkE1tVn8lJZjMq4UaiXH6jc="; }; - nativeBuildInputs = [ pkg-config gperf ]; - buildInputs = [ - glib util-linux kmod + nativeBuildInputs = [ + autoreconfHook + gperf + pkg-config ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - patches = [ + + buildInputs = [ + glib + kmod + util-linux ]; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" ]; + makeFlags = [ "hwdb_bin=/var/lib/udev/hwdb.bin" "udevrulesdir=/etc/udev/rules.d" ]; preInstall = '' - # Disable install-exec-hook target as it conflicts with our move-sbin setup-hook + # Disable install-exec-hook target, + # as it conflicts with our move-sbin setup-hook + sed -i 's;$(MAKE) $(AM_MAKEFLAGS) install-exec-hook;$(MAKE) $(AM_MAKEFLAGS);g' src/udev/Makefile ''; - installFlags = - [ + installFlags = [ "localstatedir=$(TMPDIR)/var" "sysconfdir=$(out)/etc" "udevconfdir=$(out)/etc/udev" "udevhwdbbin=$(out)/var/lib/udev/hwdb.bin" "udevhwdbdir=$(out)/var/lib/udev/hwdb.d" "udevrulesdir=$(out)/var/lib/udev/rules.d" - ]; - enableParallelBuilding = true; - meta = { - inherit (s) version; - description = "An udev fork by Gentoo"; - license = lib.licenses.gpl2Plus ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; - homepage = "https://wiki.gentoo.org/wiki/Project:Eudev"; - downloadPage = "http://dev.gentoo.org/~blueness/eudev/"; - updateWalker = true; + ]; + + meta = with lib; { + homepage = "https://github.com/eudev-project/eudev"; + description = "A fork of udev with the aim of isolating it from init"; + license = licenses.gpl2Plus ; + maintainers = with maintainers; [ raskin AndersonTorres ]; + platforms = platforms.linux; }; }