From cb3f5a2d9c38d51fd9b4382dbdc8b3a895988b71 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 10 Apr 2018 11:34:24 +0800 Subject: asciidoctor: Use an explicit path to patchelf Hopefully fixing the Darwin build --- pkgs/tools/typesetting/asciidoctor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 29fd62f7adcc..90ef7d4e0e60 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerApp, ruby, curl # Dependencies of the 'mathematical' package , cmake, bison, flex, glib, pkgconfig, cairo -, pango, gdk_pixbuf, libxml2, python3 +, pango, gdk_pixbuf, libxml2, python3, patchelf }: bundlerApp { @@ -39,8 +39,8 @@ bundlerApp { # For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here postFixup = '' soPath="$out/lib/ruby/gems/2.4.0/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so" - patchelf \ - --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(patchelf --print-rpath "$soPath")" \ + ${patchelf}/bin/patchelf \ + --set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \ "$soPath" ''; }; -- cgit 1.4.1