diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 22:20:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 22:20:03 -0400 |
| commit | 87944c3125c4e69a69e76003c0ed5bf47bf0c4d8 (patch) | |
| tree | 6c6e4f084e2ed6567719d44b4dd377829cd2c6f8 /pkgs/tools/text | |
| parent | 1cf626ce29f154c5742196327e03dbd61d0ed988 (diff) | |
| parent | c1f1a0ea159a4513be524fa775ad708debd19aa1 (diff) | |
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/platinum-searcher/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/text/sgml/opensp/default.nix | 20 |
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 829d734a8f75..4b30387f7ac5 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -16,11 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - # fixes cycle between $out and $bin - install_name_tool -delete_rpath $out/lib $bin/bin/pt - ''; - meta = with stdenv.lib; { homepage = https://github.com/monochromegane/the_platinum_searcher; description = "A code search tool similar to ack and the_silver_searcher(ag)."; diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 27fa7bb91a8f..8d659713d954 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: +{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 +, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: stdenv.mkDerivation { name = "opensp-1.5.2"; @@ -8,16 +9,18 @@ stdenv.mkDerivation { sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; - patchPhase = '' + postPatch = '' sed -i s,/usr/share/sgml/docbook/xml-dtd-4.1.2/,${docbook_xml_dtd_412}/xml/dtd/docbook/, \ docsrc/*.xml ''; - configureFlags = lib.optional stdenv.isDarwin [ - "--with-libintl-prefix=/usr" - "--with-libiconv-prefix=/usr" + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/opensp/files/opensp-1.5.2-c11-using.patch?id=688d9675782dfc162d4e6cff04c668f7516118d0"; + sha256 = "04q14s8qsad0bkjmj067dn831i0r6v7742rafdlnbfm5y249m2q6"; + }) ]; - + setupHook = ./setup-hook.sh; postFixup = '' @@ -29,8 +32,9 @@ stdenv.mkDerivation { preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null; # need autoconf, automake, gettext, and libtool for reconfigure - buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ] - ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; + + buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl gettext libiconv ]; doCheck = false; # fails |