diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
| commit | 7495c61d49208a9fc90b937bca548d9005ff17c8 (patch) | |
| tree | 5eec5f802d3146b8b1f788aa1275ea1c44a24d31 /pkgs/tools/text/sgml | |
| parent | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (diff) | |
| parent | 899d81b37ba6dc26431b82b40300505f19504e03 (diff) | |
| download | nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.gz nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.bz2 nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.lz nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.xz nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.zst nixpkgs-7495c61d49208a9fc90b937bca548d9005ff17c8.zip | |
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts: pkgs/applications/editors/vim/macvim.nix
Diffstat (limited to 'pkgs/tools/text/sgml')
| -rw-r--r-- | pkgs/tools/text/sgml/opensp/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 23ce8ccc5a8..4b807718baa 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl}: +{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl }: stdenv.mkDerivation { name = "opensp-1.5.2"; @@ -13,6 +13,10 @@ stdenv.mkDerivation { docsrc/*.xml ''; + configureFlags = lib.optional stdenv.isDarwin [ + "--with-libintl-prefix=/usr" + "--with-libiconv-prefix=/usr" + ]; setupHook = ./setup-hook.sh; @@ -22,7 +26,6 @@ stdenv.mkDerivation { sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html ''; - buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; meta = { |