git.iko.soy/typeable/nixpkgs
on master help sign in
iwd: don't use '/usr' prefix, prefer placeholder over quote-and-pray
commitd5c660c9ddd079567bc1186078c54fb155ff7d0d authorWill Dietz <w@wdtz.org> dateMon 28 Jan 2019, 21:41 (8 years ago) parent8238e19
1 file changed+5−5
pkgs/os-specific/linux/iwd/default.nix+5−5
pkgs/os-specific/linux/iwd/default.nix+5−5
@@ -33,9 +33,9 @@ in stdenv.mkDerivation rec {
3333 ];
3434
3535 configureFlags = [
36− "--with-dbus-datadir=$(out)/etc/"
37− "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
38− "--with-systemd-unitdir=$(out)/lib/systemd/system/"
36+ "--with-dbus-datadir=${placeholder "out"}/etc/"
37+ "--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
38+ "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
3939 "--localstatedir=/var/"
4040 "--enable-wired"
4141 ];
@@ -57,9 +57,9 @@ in stdenv.mkDerivation rec {
5757 '';
5858
5959 postFixup = ''
60− substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \
60+ substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \
6161 --replace /bin/false ${coreutils}/bin/false
62− substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
62+ substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \
6363 --replace /bin/false ${coreutils}/bin/false
6464 '';
6565