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

dosfstools: fix build on darwin #25740

Merged
merged 1 commit into from
May 13, 2017
Merged

Conversation

georgewhewell
Copy link
Contributor

@georgewhewell georgewhewell commented May 12, 2017

Motivation for this change

before: charconv.c:2:10: fatal error: 'iconv.h' file not found
after: build works

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

@georgewhewell, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @dezgeg and @obadz to be potential reviewers.

@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkgconfig libiconv ];
Copy link
Member

Choose a reason for hiding this comment

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

this should be conditional for darwin, eg.

{
    nativeBuildInputs = [ autoreconfHook pkgconfig ]
      ++ stdenv.lib.optional stdenv.isDarwin libiconv;
}

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label May 12, 2017
@georgewhewell
Copy link
Contributor Author

@LnL7 thanks, have updated

@LnL7 LnL7 merged commit d8fd62d into NixOS:master May 13, 2017
@georgewhewell georgewhewell deleted the dosfstools/fix-darwin branch May 13, 2017 11:08
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