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.

Sign up for GitHub

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

Jump to bottom

mdds: mark broken on darwin #104887

Merged
merged 1 commit into from Nov 25, 2020
Merged

mdds: mark broken on darwin #104887

merged 1 commit into from Nov 25, 2020

Conversation

SuperSandro2000
Copy link
Member

Motivation for this change

#102572

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 25, 2020
@SuperSandro2000
Copy link
Member Author

Result of nixpkgs-review pr 104887 run on x86_64-darwin 1

@RaghavSood RaghavSood merged commit be94105 into NixOS:master Nov 25, 2020
@marsam
Copy link
Contributor

marsam commented Nov 25, 2020

I think you can fix the darwin build with:

--- i/pkgs/development/libraries/mdds/default.nix
+++ w/pkgs/development/libraries/mdds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost }:
+{ stdenv, fetchurl, boost, llvmPackages }:
 
 stdenv.mkDerivation rec {
   pname = "mdds";
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
   '';
 
+  buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
+
   checkInputs = [ boost ];
 
   meta = with stdenv.lib; {

@SuperSandro2000 SuperSandro2000 deleted the mdds-darwin branch November 25, 2020 13:16
@SuperSandro2000 SuperSandro2000 mentioned this pull request Nov 25, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaghavSood RaghavSood RaghavSood approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@SuperSandro2000 @marsam @RaghavSood