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.

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

rstudio: fix build #28421

Merged
merged 1 commit into from
Aug 23, 2017
Merged

rstudio: fix build #28421

merged 1 commit into from
Aug 23, 2017

Conversation

sifmelcara
Copy link
Member

@sifmelcara sifmelcara commented Aug 20, 2017

Motivation for this change

Fixes #27600

This commit do the following:

  1. removes nativeBuildInputs = [ qt5.qmake ];, which was added by @ttuegel . This change makes rstudio built again. Although I have no idea why removing qt5.qmake from nativeBuildInputs will fix the problem and I am not very sure if this is the correct fix (maybe this breaks cross compiling or something?).
  2. change ${qt5.qmake}/bin/qmake" to $NIX_QT5_TMP/bin/qmake", since this is the correct path to find qmake binary.
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@sifmelcara, thanks for your PR! By analyzing the history of the files in this pull request, we identified @changlinli, @ehmry and @lverns to be potential reviewers.

@ttuegel
Copy link
Member

ttuegel commented Aug 20, 2017

change ${qt5.qmake}/bin/qmake" to $NIX_QT5_TMP/bin/qmake", since this is the correct path to find qmake binary.

Thanks for catching this. Referring directly to the store path for qmake was never correct.

removes nativeBuildInputs = [ qt5.qmake ];, which was added by @ttuegel . This change makes rstudio built again. Although I have no idea why removing qt5.qmake from nativeBuildInputs will fix the problem and I am not very sure if this is the correct fix (maybe this breaks cross compiling or something?).

Including the qt5.qmake setup hook is required for qmake to find Qt during the build. I would be very surprised if the build succeeds without it. However, some builds only use qmake to find certain paths and not to do the actual build; possibly that is happening here. If it works, then it works.

@sifmelcara
Copy link
Member Author

sifmelcara commented Aug 20, 2017

However, some builds only use qmake to find certain paths and not to do the actual build; possibly that is happening here.

The strange thing is that rstudio's cmake file only want QT_QMAKE_EXECUTABLE to be set to some value and don't care if there is actually a qmake executable in the given path.
However, since it builds fine and its rstudio executable runs correctly, I think it can be kept as is.

Edit: I mean, the second change in this commit is not necessary to make rstudio build and work correctly.

@ciil
Copy link
Member

ciil commented Aug 21, 2017

Thank god, it's running again and it's a reasonably current release. Just tested the build with your changes as well and encountered no problems.

@sifmelcara
Copy link
Member Author

I think this PR is ready to be merged, since rstudio had successfully been built on travis and also @ciil reports this PR solves the problem.

@joachifm joachifm merged commit e9f9dee into NixOS:master Aug 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RStudio fails to build
5 participants