Merge pull request #241974 from SohamG/pkg/oddjob

authored by Sandro and committed by GitHub 3168d64a 6e17add1

+91
+1
nixos/modules/module-list.nix
··· 222 222 ./programs/noisetorch.nix 223 223 ./programs/npm.nix 224 224 ./programs/oblogout.nix 225 + ./programs/oddjobd.nix 225 226 ./programs/openvpn3.nix 226 227 ./programs/pantheon-tweaks.nix 227 228 ./programs/partition-manager.nix
+28
nixos/modules/programs/oddjobd.nix
··· 1 + { config, pkgs, lib, ... }: 2 + 3 + let 4 + cfg = config.programs.oddjobd; 5 + in 6 + { 7 + options.programs.oddjobd = { 8 + enable = lib.mkEnableOption "oddjob"; 9 + package = lib.mkPackageOption pkgs "oddjob" {}; 10 + }; 11 + 12 + config = lib.mkIf cfg.enable { 13 + systemd.packages = [ cfg.package ]; 14 + 15 + systemd.services.oddjobd = { 16 + wantedBy = [ "multi-user.target"]; 17 + after = [ "network.target"]; 18 + description = "DBUS Odd-job Daemon"; 19 + enable = true; 20 + documentation = [ "man:oddjobd(8)" "man:oddjobd.conf(5)" ]; 21 + serviceConfig = { 22 + Type = "dbus"; 23 + BusName = "org.freedesktop.oddjob"; 24 + ExecStart = "${lib.getExe cfg.package}/bin/oddjobd"; 25 + }; 26 + }; 27 + }; 28 + }
+60
pkgs/os-specific/linux/oddjob/default.nix
··· 1 + { lib 2 + , fetchurl 3 + , stdenv 4 + , autoreconfHook 5 + , dbus 6 + , libxml2 7 + , pam 8 + , pkg-config 9 + , systemd 10 + }: 11 + 12 + stdenv.mkDerivation rec { 13 + pname = "oddjob"; 14 + version = "0.34.7"; 15 + 16 + src = fetchurl { 17 + url = "https://pagure.io/oddjob/archive/${pname}-${version}/oddjob-${pname}-${version}.tar.gz"; 18 + hash = "sha256-SUOsMH55HtEsk5rX0CXK0apDObTj738FGOaL5xZRnIM="; 19 + }; 20 + 21 + nativeBuildInputs = [ 22 + autoreconfHook 23 + pkg-config 24 + ]; 25 + 26 + buildInputs =[ 27 + libxml2 28 + dbus 29 + pam 30 + systemd 31 + ]; 32 + 33 + postPatch = '' 34 + substituteInPlace configure.ac \ 35 + --replace 'SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null`' "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}" \ 36 + --replace 'SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd`' "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}" 37 + ''; 38 + 39 + configureFlags = [ 40 + "--prefix=${placeholder "out"}" 41 + "--sysconfdir=${placeholder "out"}/etc" 42 + "--with-selinux-acls=no" 43 + "--with-selinux-labels=no" 44 + "--disable-systemd" 45 + ]; 46 + 47 + postConfigure = '' 48 + substituteInPlace src/oddjobd.c \ 49 + --replace "globals.selinux_enabled" "FALSE" 50 + ''; 51 + 52 + meta = with lib; { 53 + description = "Odd Job Daemon"; 54 + homepage = "https://pagure.io/oddjob"; 55 + changelog = "https://pagure.io/oddjob/blob/oddjob-${version}/f/ChangeLog"; 56 + license = licenses.bsd0; 57 + platforms = platforms.linux; 58 + maintainers = with maintainers; [ SohamG ]; 59 + }; 60 + }
+2
pkgs/top-level/all-packages.nix
··· 9888 9888 9889 9889 notesnook = callPackage ../applications/misc/notesnook { }; 9890 9890 9891 + oddjob = callPackage ../os-specific/linux/oddjob { }; 9892 + 9891 9893 openipmi = callPackage ../tools/system/openipmi { }; 9892 9894 9893 9895 ox = callPackage ../applications/editors/ox { };