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

Backport 19.09: vcv-rack: Fix issues from missing upstream dependency #72042

Merged
merged 1 commit into from Oct 27, 2019
Merged

Backport 19.09: vcv-rack: Fix issues from missing upstream dependency #72042

merged 1 commit into from Oct 27, 2019

Conversation

Moredread
Copy link
Contributor

The revision of the glfw fork that Rack depends on has been removed from
GitHub. This causes cloning of the glfw submodule for the Rack git
repository to fail.

As the glfw fork just adds a function that is only needed on Darwin (and
we don't support that platform at the moment) we remove the function
call from the Rack source. We can then use the upstream version of glfw.

We fetch the rest of the submodules manually as well.

See #71189 for the context.

(cherry picked from commit 0347078)

Motivation for this change

Backport for PR #71233 to 19.09.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@Moredread
vcv-rack: Fix issues from missing upstream dependency
dae8b94 
The revision of the glfw fork that Rack depends on has been removed from
GitHub. This causes cloning of the glfw submodule for the Rack git
repository to fail.

As the glfw fork just adds a function that is only needed on Darwin (and
we don't support that platform at the moment) we remove the function
call from the Rack source. We can then use the upstream version of glfw.

We fetch the rest of the submodules manually as well.

See NixOS#71189 for the context.

(cherry picked from commit 0347078)
@Moredread Moredread changed the title vcv-rack: Fix issues from missing upstream dependency Backport 19.09: vcv-rack: Fix issues from missing upstream dependency Oct 26, 2019
@Moredread Moredread mentioned this pull request Oct 26, 2019
Merged
10 tasks
@mrVanDalo
Copy link
Contributor

I tested it using nix-review on NixOS 19.09 and it works fine. I did not get the part about Darwin, because this package is only for linux, according to the metadata.

@Lassulus Lassulus merged commit da27632 into NixOS:release-19.09 Oct 27, 2019
@Moredread
Copy link
Contributor Author

@mrVanDalo Thanks for the review!

@Moredread Moredread deleted the vcv-fix-backport branch October 27, 2019 14:10
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: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Moredread @mrVanDalo @Lassulus