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

Revert "libjpeg_turbo: apply cmake patch for darwin" #107954

Merged
merged 1 commit into from Dec 30, 2020
Merged

Revert "libjpeg_turbo: apply cmake patch for darwin" #107954

merged 1 commit into from Dec 30, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Dec 30, 2020

cmake is now on 3.19.2 solving the bug that required this patch.

This reverts commit 5524c43.

Motivation for this change
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.

@FRidh
Revert "libjpeg_turbo: apply cmake patch for darwin"
9542d42 
cmake is now on 3.19.2 solving the bug that required this patch.

This reverts commit 5524c43.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 30, 2020
@FRidh
Copy link
Member Author

FRidh commented Dec 30, 2020

pr to let ofborg check darwin build

@FRidh
Copy link
Member Author

FRidh commented Dec 30, 2020

@GrahamcOfBorg build libjpeg_turbo

r-burns
r-burns approved these changes Dec 30, 2020
View reviewed changes
Copy link
Contributor

@r-burns r-burns left a comment

Choose a reason for hiding this comment

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

Built libjpeg_turbo and git locally

@FRidh
Copy link
Member Author

FRidh commented Dec 30, 2020

Built libjpeg_turbo and git locally

Alright, thanks.

@FRidh FRidh merged commit 027c952 into NixOS:staging-next Dec 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@r-burns r-burns r-burns approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@FRidh @r-burns