Skip to content

[staging-next] gnutls: fix build on darwin #108087

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

Closed
wants to merge 1 commit into from

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Jan 1, 2021

Incompatible with staged update to autoconf 2.70.
No effect on linux as autoconf is only needed on darwin.

cc @FRidh

Motivation for this change

#107783
https://hydra.nixos.org/build/133918690

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.

Sorry, something went wrong.

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Incompatible with staged update to autoconf 2.70.
No effect on linux as autoconf is only needed on darwin.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 1, 2021
@r-burns r-burns changed the title gnutls: fix build on darwin [staging-next] gnutls: fix build on darwin Jan 1, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 1, 2021
@r-burns
Copy link
Contributor Author

r-burns commented Jan 1, 2021

Inkscape builds now. More dependencies of qtmultimedia are building but libpulseaudio fails

@@ -13352,6 +13352,7 @@ in
gnutls = callPackage ../development/libraries/gnutls/default.nix {
inherit (darwin.apple_sdk.frameworks) Security;
util-linux = util-linuxMinimal; # break the cyclic dependency
autoconf = autoconf269;
Copy link
Member

Choose a reason for hiding this comment

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

Please use buildPackages.autoconf269 to not break cross

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the other pins in all-packages use autoconf = autoconf269;, is that going to cause problems? I see that autoreconfHook is made to use buildPackages but not so for autoconf itself

Copy link
Member

Choose a reason for hiding this comment

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

See bf46afd, this should be done for all nativeBuildInputs that are called with an explicit argument.

Copy link
Member

Choose a reason for hiding this comment

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

made the treewide change in 136c0d0

@FRidh
Copy link
Member

FRidh commented Jan 1, 2021

pushed this change as b095078 with buildPackages

@FRidh FRidh closed this Jan 1, 2021
@r-burns r-burns deleted the gnutls branch January 5, 2021 09:15
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 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants