From 147ff753f5001e09f0d5962f99e7cacde3f897f2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer <mjbauer95@gmail.com> Date: Tue, 6 Nov 2018 19:58:20 -0600 Subject: [PATCH] shadowsocks-libev: set install name correctly This avoids having to invoke install_name_tool. --- .../networking/shadowsocks-libev/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 09fa69dd37c4..27c4590f88b8 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -16,27 +16,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ libsodium mbedtls libev c-ares pcre ]; - nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; + nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 + docbook_xsl libxslt ]; - cmakeFlags = [ "-DWITH_STATIC=OFF" ]; + cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; postInstall = '' cp lib/* $out/lib chmod +x $out/bin/* mv $out/pkgconfig $out/lib - - ${stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libcork.dylib $out/lib/libcork.dylib $out/lib/libipset.dylib - install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $out/lib/libipset.dylib - - for exe in $out/bin/*; do - install_name_tool -change libmbedtls.dylib ${mbedtls}/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedcrypto.dylib ${mbedtls}/lib/libmbedcrypto.dylib $exe - install_name_tool -change libcork.dylib $out/lib/libcork.dylib $exe - install_name_tool -change libipset.dylib $out/lib/libipset.dylib $exe - install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $exe - done - ''} ''; meta = with stdenv.lib; {