pyrox.dev
oddjob: move oddjobd.service SystemD service to lib/systemd/system
+10
-7
pkgs/os-specific/linux/oddjob/default.nix
+10
-7
pkgs/os-specific/linux/oddjob/default.nix
···
1
{ lib
2
, fetchurl
3
, stdenv
4
, autoreconfHook
···
18
url = "https://pagure.io/oddjob/archive/${pname}-${version}/oddjob-${pname}-${version}.tar.gz";
19
hash = "sha256-SUOsMH55HtEsk5rX0CXK0apDObTj738FGOaL5xZRnIM=";
20
};
21
22
nativeBuildInputs = [
23
autoreconfHook
···
31
systemd
32
];
33
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
configureFlags = [
41
"--prefix=${placeholder "out"}"
42
"--sysconfdir=${placeholder "out"}/etc"
43
"--with-selinux-acls=no"
44
"--with-selinux-labels=no"
45
-
"--disable-systemd"
46
];
47
48
postConfigure = ''
···
1
{ lib
2
+
, fetchpatch
3
, fetchurl
4
, stdenv
5
, autoreconfHook
···
19
url = "https://pagure.io/oddjob/archive/${pname}-${version}/oddjob-${pname}-${version}.tar.gz";
20
hash = "sha256-SUOsMH55HtEsk5rX0CXK0apDObTj738FGOaL5xZRnIM=";
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
+
];
30
31
nativeBuildInputs = [
32
autoreconfHook
···
40
systemd
41
];
42
43
configureFlags = [
44
"--prefix=${placeholder "out"}"
45
"--sysconfdir=${placeholder "out"}/etc"
46
"--with-selinux-acls=no"
47
"--with-selinux-labels=no"
48
+
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
49
];
50
51
postConfigure = ''