public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwd: don't use '/usr' prefix, prefer placeholder over quote-and-pray

Browse Source
This commit is contained in:
Will Dietz 2019-01-28 21:41:23 -06:00
parent 8238e19c2f
commit d5c660c9dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/iwd/default.nix
View File

@ -33,9 +33,9 @@ in stdenv.mkDerivation rec {
];
configureFlags = [
"--with-dbus-datadir=$(out)/etc/"
"--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
"--with-systemd-unitdir=$(out)/lib/systemd/system/"
"--with-dbus-datadir=${placeholder "out"}/etc/"
"--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
"--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
"--localstatedir=/var/"
"--enable-wired"
];
@ -57,9 +57,9 @@ in stdenv.mkDerivation rec {
'';
postFixup = ''
substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \
substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \
--replace /bin/false ${coreutils}/bin/false
substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \
--replace /bin/false ${coreutils}/bin/false
'';