Skip to content

Commit 3198fce

Browse files
authored
{ovn,evolution}: Fix command not found (NixOS#465591)
2 parents 06f4ba9 + d4c5ec6 commit 3198fce

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

pkgs/applications/networking/mailreaders/evolution/evolution/default.nix

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
p11-kit,
4343
openldap,
4444
spamassassin,
45+
gnutar,
46+
gzip,
47+
xz,
4548
}:
4649

4750
stdenv.mkDerivation rec {
@@ -116,6 +119,18 @@ stdenv.mkDerivation rec {
116119
"-DWITH_OPENLDAP=${openldap}"
117120
];
118121

122+
preFixup = ''
123+
gappsWrapperArgs+=(
124+
--prefix PATH : "${
125+
lib.makeBinPath [
126+
gnutar
127+
gzip
128+
xz
129+
]
130+
}"
131+
)
132+
'';
133+
119134
requiredSystemFeatures = [
120135
"big-parallel"
121136
];

pkgs/by-name/ov/ovn/package.nix

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
unbound,
1616
xdp-tools,
1717
openvswitch,
18+
gawk,
19+
coreutils,
20+
gnugrep,
21+
gnused,
1822
makeWrapper,
1923
}:
2024
let
@@ -117,7 +121,15 @@ stdenv.mkDerivation (finalAttrs: {
117121
ln -s ${openvswitch}/share/openvswitch/scripts/ovs-lib $out/share/openvswitch/scripts/ovs-lib
118122
119123
wrapProgram $out/share/ovn/scripts/ovn-ctl \
120-
--prefix PATH : ${lib.makeBinPath [ openvswitch ]}
124+
--prefix PATH : ${
125+
lib.makeBinPath [
126+
openvswitch
127+
gawk
128+
coreutils # tr
129+
gnugrep
130+
gnused
131+
]
132+
}
121133
'';
122134

123135
env = {

0 commit comments

Comments
 (0)