From 30ab2300bcf4d1e3e5bf031e67cd089aba828ea0 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Mon, 27 Aug 2018 23:26:06 +0200 Subject: [PATCH] navit: fix plugins --- pkgs/applications/misc/navit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 5d591243f50..ede20d7935b 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -68,10 +68,10 @@ stdenv.mkDerivation rec { ''; # TODO: fix upstream? + libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); postFixup = '' - for lib in $(find "$out/lib/navit/" -iname "*.so" ); do - patchelf --set-rpath ${makeLibraryPath buildInputs} $lib - done + find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \; + wrapProgram $out/bin/navit \ --prefix PATH : ${makeBinPath ( optional xkbdSupport xkbd