commit d83cce069c483508c015256f2eaea20e164431af parent f847830a06688caf7ea86f9eea2023cdaa108520 Author: Daniel Barlow <dan@telent.net> Date: Mon, 22 Jul 2024 14:47:28 +0100 remove awful pkg-config kludge, use depwBuildBuld Diffstat:
| M | pkgs/modem-manager/default.nix | | | 14 | ++++---------- |
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/pkgs/modem-manager/default.nix b/pkgs/modem-manager/default.nix @@ -58,6 +58,10 @@ bash # shebangs in share/ModemManager/fcc-unlock.available.d/ ]; + depsBuildBuild = [ + pkg-config + ]; + mesonFlags = [ "-Dudevdir=${placeholder "out"}/lib/udev" "-Ddbus_policy_dir=${placeholder "out"}/share/dbus-1/system.d" @@ -75,14 +79,4 @@ "-Dintrospection=false" ]; - postPatch = '' - env | grep PKG - mkdir bin - PATH=${buildPackages.pkg-config}/bin:$PATH - PATH=$PWD/bin:$PATH - ln -s ${buildPackages.pkg-config}/bin/$PKG_CONFIG bin/pkg-config - echo $PATH | sed 's/:/\n/g' | grep pkg - type pkg-config - patchShebangs tools/test-modemmanager-service.py - ''; }