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

Correct derivation of pthreads on mingw64 #33357

Merged
merged 2 commits into from Jan 3, 2018
Merged

Correct derivation of pthreads on mingw64 #33357

merged 2 commits into from Jan 3, 2018

Conversation

bnikolic
Copy link
Contributor

@bnikolic bnikolic commented Jan 2, 2018 •
edited by Ericson2314

The C compiler is needed -- copy and paste error from the headers
derivation?

Motivation for this change

Mingw64-pthreads fails to configure currently as it can not find the C compiler. This correct the defect.

Things done

https://hydra.nixos.org/eval/1423028

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • [ X] 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@bnikolic
Copy link
Contributor Author

bnikolic commented Jan 2, 2018

@Ericson2314

@Ericson2314
Copy link
Member

Ericson2314 commented Jan 2, 2018 •
edited

@bnikolic Thanks! Looks indeed like a copy-paste error of mine. Can you add this to pkgs/top-level/release-cross.nix?

@Ericson2314 Ericson2314 added 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 6.topic: windows Running, or buiding, packages on Windows labels Jan 2, 2018
@bnikolic
Copy link
Contributor Author

bnikolic commented Jan 2, 2018

@Ericson2314 Revised -- I haven't used release-cross before so please check

@Ericson2314
Copy link
Member

Thanks! I'll get it tested.

Ericson2314 and others added 2 commits January 2, 2018 18:59
@Ericson2314
Merge branch 'pharo' into ericson2314-cross-base
cb8349f
@bnikolic @Ericson2314
mingw-w64-pthreads: The C compiler is needed
db475df 
It was a copy and paste error from the headers derivation. Also test in
release-cross.
@Ericson2314 Ericson2314 changed the base branch from staging to master January 3, 2018 00:05
@Ericson2314 Ericson2314 changed the base branch from master to staging January 3, 2018 00:09
@Ericson2314 Ericson2314 changed the base branch from staging to master January 3, 2018 00:09
@Ericson2314 Ericson2314 merged commit 0e3be42 into NixOS:master Jan 3, 2018
@Ericson2314
Copy link
Member

(For the record, the diff is just borked. @LnL7's pharo fix was merged separately.

@Ericson2314 Ericson2314 added this to After big PR in Cross compilation Jan 3, 2018
@bnikolic bnikolic deleted the mingw64-pthreads branch January 17, 2018 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@FRidh FRidh Awaiting requested review from FRidh

@peti peti Awaiting requested review from peti

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 6.topic: windows Running, or buiding, packages on Windows 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
No open projects
Cross compilation
After big PR
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bnikolic @Ericson2314 @GrahamcOfBorg