Skip to content

mullvad: fix build#211469

Merged
cole-h merged 1 commit intoNixOS:masterfrom
cole-h:mullvad
Jan 19, 2023
Merged

mullvad: fix build#211469
cole-h merged 1 commit intoNixOS:masterfrom
cole-h:mullvad

Conversation

@cole-h
Copy link
Member

@cole-h cole-h commented Jan 18, 2023 •
edited
Loading

#207804 removed git from nativeBuildInputs for buildRustPackage, which is apparently what allowed the build.rs to work here. Bring it back for this single package.

Description of changes

#207804 broke the build because mullvad relied on git being accessible in build.rs.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@cole-h
mullvad: fix build
857f76f 
NixOS#207804 removed git from
nativeBuildInputs for buildRustPackage, which is apparently what allowed
the build.rs to work here. Bring it back for this single package.
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jan 18, 2023
@cole-h
Copy link
Member Author

cole-h commented Jan 19, 2023

This is relatively unobtrusive and just fixes the build, so I'm going to merge it without reviews (though I usually try not to).

@cole-h cole-h merged commit afed882 into NixOS:master Jan 19, 2023
@cole-h cole-h deleted the mullvad branch January 19, 2023 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@cole-h