diff options
| -rw-r--r-- | nixos/modules/programs/udevil.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/udevil/default.nix | 33 |
2 files changed, 27 insertions, 9 deletions
diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix index ba5670f9dfe..25975d88ec8 100644 --- a/nixos/modules/programs/udevil.nix +++ b/nixos/modules/programs/udevil.nix @@ -10,5 +10,8 @@ in { config = mkIf cfg.enable { security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + + systemd.packages = [ pkgs.udevil ]; + systemd.services."devmon@".wantedBy = [ "multi-user.target" ]; }; } diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index e83a5e9a2c7..9d1df5245ed 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,12 +1,20 @@ -{ lib, stdenv, fetchurl, intltool, glib, pkg-config, udev, util-linux, acl }: -stdenv.mkDerivation { - name = "udevil-0.4.4"; - src = fetchurl { - url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; - sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; +{ lib, stdenv, fetchFromGitHub, intltool, glib, pkg-config, udev, util-linux, acl }: + +stdenv.mkDerivation rec { + pname = "udevil"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "IgnorantGuru"; + repo = "udevil"; + rev = version; + sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ intltool glib udev ]; + configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" # do not set setuid bit in nix store @@ -19,11 +27,18 @@ stdenv.mkDerivation { --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; + + postInstall = '' + substituteInPlace $out/lib/systemd/system/devmon@.service \ + --replace /usr/bin/devmon "$out/bin/devmon" + ''; + patches = [ ./device-info-sys-stat.patch ]; - meta = { + + meta = with lib; { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; homepage = "https://ignorantguru.github.io/udevil/"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3Plus; }; } |