From ada49ba736f65dfe444bbf4585eb16c10409b128 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 5 Nov 2018 12:34:24 -0600 Subject: [PATCH] talloc: use fixDarwinDylibNames MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The makefile isn’t setting install_name properly causing issues on macOS. fixDarwinDylibNames seems to fix this. --- pkgs/development/libraries/talloc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 77c3c6458ad..7c758d29835 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42 +, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig fixDarwinDylibNames ]; buildInputs = [ python readline libxslt docbook_xsl docbook_xml_dtd_42 ]; - preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf + prePatch = '' + patchShebangs buildtools/bin/waf ''; configureFlags = [