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

vcv-rack: Fix broken glfw fork issue #71233

Merged
merged 1 commit into from
Oct 26, 2019
Merged

vcv-rack: Fix broken glfw fork issue #71233

merged 1 commit into from
Oct 26, 2019
+57 −26

Conversation

Moredread
Copy link
Contributor

Motivation for this change

The commit we previously used of the glfw fork for Rack disappeared. See #71189

It looks like it is easier to patch out that function call, as it isn't needed on Linux. But we still need a newer version of glfw.

Needs backport to 19.09, as Rack is broken there as well.

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.
Notify maintainers

cc @

Sorry, something went wrong.

@Moredread
Copy link
Contributor Author

cc @nathyong
cc @prusnak does this work for you?

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 16, 2019
@prusnak
Copy link
Member

prusnak commented Oct 16, 2019

No, it doesn't work because the fetchFromGitHub { fetchSubmodules = true; } tries to fetch the same missing commit.

@jonringer
Copy link
Contributor

You could also pre-fetch the other gitmodules

[submodule "dep/nanovg"]
	path = dep/nanovg
	url = https://github.com/memononen/nanovg.git
	ignore = untracked
[submodule "dep/nanosvg"]
	path = dep/nanosvg
	url = https://github.com/memononen/nanosvg.git
	ignore = untracked
[submodule "dep/osdialog"]
	path = dep/osdialog
	url = https://github.com/AndrewBelt/osdialog.git
	ignore = untracked
[submodule "dep/oui-blendish"]
	path = dep/oui-blendish
	url = https://github.com/AndrewBelt/oui-blendish.git
	ignore = untracked
[submodule "dep/rtaudio"]
	path = dep/rtaudio
	url = https://github.com/thestk/rtaudio.git
	ignore = untracked
[submodule "dep/glfw"]
	path = dep/glfw
	url = https://github.com/AndrewBelt/glfw.git
	ignore = untracked

@Moredread
Copy link
Contributor Author

@jonringer yes, I think that is a good idea, esp. as we only need some of them.

@Moredread
Copy link
Contributor Author

@prusnak thanks, I still had it in my cache.

@Moredread Moredread force-pushed the vcv-rack-glfw branch 2 times, most recently from 18f1ef8 to 0e7dae7 Compare October 19, 2019 03:53
@Moredread
Copy link
Contributor Author

Moredread commented Oct 19, 2019 •
edited
Loading

I've updated the PR. The derivation now pulls the dependencies with fetchFromGitHub, not as submodules.

@Moredread
vcv-rack: Fix issues from missing upstream dependency
66eb703 
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.
@prusnak
Copy link
Member

prusnak commented Oct 19, 2019 •
edited
Loading

I confirm that 66eb703 works on my unstable machine! 🎉

I agree this needs backport to 19.09 too.

@Moredread Moredread changed the title (WIP) vcv-rack: Fix broken glfw fork issue vcv-rack: Fix broken glfw fork issue Oct 20, 2019
@573 573 mentioned this pull request Oct 23, 2019
Closed
Lassulus
Lassulus approved these changes Oct 26, 2019
View reviewed changes
Copy link
Member

@Lassulus Lassulus left a comment

Choose a reason for hiding this comment

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

tested with nix-review, started the GUI, logged into my account and clicked around a bit.
Can someone open a backport PR for this?

@Lassulus Lassulus merged commit 0347078 into NixOS:master Oct 26, 2019
@Moredread Moredread mentioned this pull request Oct 26, 2019
Merged
10 tasks
@Moredread
Copy link
Contributor Author

@Lassulus I created a backport PR with PR #72042

@Moredread Moredread deleted the vcv-rack-glfw branch October 26, 2019 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lassulus Lassulus

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Moredread @prusnak @jonringer @Lassulus