Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnuapl: add Darwin support #21251

Merged
merged 1 commit into from
Dec 18, 2016
Merged

gnuapl: add Darwin support #21251

merged 1 commit into from
Dec 18, 2016

Conversation

mdaiter
Copy link
Contributor

@mdaiter mdaiter commented Dec 18, 2016

Motivation for this change

Adding Darwin support for GNU APL.
Implementation of GNU APL support taken from here: https://github.com/Homebrew/homebrew-core/blob/master/Formula/gnu-apl.rb

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@mdaiter, thanks for your PR! By analyzing the history of the files in this pull request, we identified @KoviRobi, @ttuegel and @lsix to be potential reviewers.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Dec 18, 2016
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {

buildInputs = [ readline gettext ncurses ];

patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i "s@malloc.h@malloc/malloc.h@" src/LApack.cc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using substituteInPlace for this is usually nicer if you don't need a regex.

substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@LnL7 LnL7 merged commit 138f8a3 into NixOS:master Dec 18, 2016
@mdaiter mdaiter deleted the aplDarwin branch December 18, 2016 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants