diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-23 11:27:53 +0200 |
| commit | cd71f7a2e660440cbcf634ba97eaae310084d11a (patch) | |
| tree | a40196e3795a4f18ff8fcc9d0f93af0fc1afa3cb /pkgs/tools/text | |
| parent | c1cf0b7dd5fccb16c8c470d8c766a050fd7a4a36 (diff) | |
| parent | 25b395bc8d8b1590723dc42edd97561611f8db68 (diff) | |
| download | nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.gz nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.bz2 nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.lz nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.xz nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.zst nixlib-cd71f7a2e660440cbcf634ba97eaae310084d11a.zip | |
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts: pkgs/development/interpreters/ruby/ruby-19.nix pkgs/development/libraries/libc++/default.nix pkgs/development/libraries/libc++abi/default.nix pkgs/tools/text/sgml/opensp/default.nix
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/sgml/opensp/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 23ce8ccc5a88..78c964dac1ea 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation { docsrc/*.xml ''; + configureFlags = optional stdenv.isDarwin [ + "--with-libintl-prefix=/usr" + "--with-libiconv-prefix=/usr" + ]; setupHook = ./setup-hook.sh; |