diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-07-18 17:06:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 17:06:06 -0400 |
| commit | bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b (patch) | |
| tree | 068db2876a7e9f0642086d534d7c5ab898117951 /pkgs/development/tools | |
| parent | 54520fce779695ef2d5dfa98ae20126c53d21692 (diff) | |
| parent | 0419452113ebb135907257bb063cb690a4de0b52 (diff) | |
| download | nixlib-bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b.tar nixlib-bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b.tar.gz nixlib-bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b.tar.bz2 nixlib-bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b.tar.lz nixlib-bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b.tar.xz nixlib-bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b.tar.zst nixlib-bd2e91e3a2bc8ee9bbc1038cc2837c9c17ee140b.zip | |
Merge pull request #27318 from copumpkin/darwin-high-sierra
Support High Sierra on Darwin
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/gnum4/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/parsing/bison/3.x.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index fbbd6cc4d6f8..33ea78907468 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, hostPlatform, fetchurl }: stdenv.mkDerivation rec { name = "gnum4-1.4.18"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-syscmd-shell=${stdenv.shell}"; # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ]; + patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index ebbee4e693dc..0369d7dabde5 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl, help2man }: +{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.4"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e"; }; + patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; + nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; |