oddjob: move oddjobd.service SystemD service to lib/systemd/system

+10 -7
+10 -7
pkgs/os-specific/linux/oddjob/default.nix
··· 1 1 { lib 2 + , fetchpatch 2 3 , fetchurl 3 4 , stdenv 4 5 , autoreconfHook ··· 18 19 url = "https://pagure.io/oddjob/archive/${pname}-${version}/oddjob-${pname}-${version}.tar.gz"; 19 20 hash = "sha256-SUOsMH55HtEsk5rX0CXK0apDObTj738FGOaL5xZRnIM="; 20 21 }; 22 + 23 + patches = [ 24 + # Define SystemD service location using `with-systemdsystemunitdir` configure flag 25 + (fetchpatch { 26 + url = "https://pagure.io/oddjob/c/f63287a35107385dcb6e04a4c742077c9d1eab86.patch"; 27 + hash = "sha256-2mmw4pJhrIk4/47FM8zKH0dTQJWnntHPNmq8VAUWqJI="; 28 + }) 29 + ]; 21 30 22 31 nativeBuildInputs = [ 23 32 autoreconfHook ··· 31 40 systemd 32 41 ]; 33 42 34 - postPatch = '' 35 - substituteInPlace configure.ac \ 36 - --replace 'SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null`' "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}" \ 37 - --replace 'SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd`' "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}" 38 - ''; 39 - 40 43 configureFlags = [ 41 44 "--prefix=${placeholder "out"}" 42 45 "--sysconfdir=${placeholder "out"}/etc" 43 46 "--with-selinux-acls=no" 44 47 "--with-selinux-labels=no" 45 - "--disable-systemd" 48 + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" 46 49 ]; 47 50 48 51 postConfigure = ''