public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56744 from matthewbauer/macos-10-12

Browse Source 
Update macOS to 10.12
This commit is contained in:
Matthew Bauer
2019-04-26 22:20:03 -04:00
committed by GitHub
parent 1cf626ce29 c1f1a0ea15
commit 87944c3125
196 changed files with 1221 additions and 3284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/text/platinum-searcher/default.nix
View File

@@ -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).";

20
pkgs/tools/text/sgml/opensp/default.nix
View File

@@ -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