diff options
Diffstat (limited to 'pkgs/tools/networking/network-manager/default.nix')
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 79913d43968..c60a409fba5 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -54,20 +54,13 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit iputils kmod openconnect ethtool coreutils dbus; + inherit iputils kmod openconnect ethtool gnused dbus; inherit (stdenv) shell; }) # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch - - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When building docs, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are replacing the variables in postPatch since substituteAll does not support - # placeholders. - ./fix-docs-build.patch ]; buildInputs = [ @@ -91,10 +84,15 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs ./tools patchShebangs libnm/generate-setting-docs.py + ''; - substituteInPlace libnm/meson.build \ - --subst-var-by DOCS_LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --subst-var-by DOCS_NIX_REDIRECTS "${placeholder "out"}/lib/libnm.so.0=$PWD/build/libnm/libnm.so.0" + preBuild = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When building docs, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p ${placeholder "out"}/lib + ln -s $PWD/libnm/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 ''; postInstall = '' |