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

Jump to bottom

octave: build without qscintilla by default #79161

Merged
merged 1 commit into from Feb 3, 2020
Merged

octave: build without qscintilla by default #79161

merged 1 commit into from Feb 3, 2020

Conversation

bcdarwin
Copy link
Member

@bcdarwin bcdarwin commented Feb 3, 2020 •
edited

  • qscintilla is used for IDE features in the GUI, which is not built since qt support isn't enabled
  • this removes qt from the Octave closure
Motivation for this change

The default Octave build was pulling in qt4 via qscintilla for no reason.

I didn't use any conditional/assert logic in the Octave expression to enforce reasonable dependencies between Qt and Qscintilla, rather simply improving the options used to build Nixpkgs, but I am open to doing so.

Build is still broken on OS X for unrelated reasons; reverse dependency octaveHg won't rebuild due to texlive issues.

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.

@bcdarwin
octave: build without qscintilla by default
3ac3677 
- qscintilla is used for IDE features in the GUI, which is not built since qt support isn't enabled
- this removes qt from the Octave closure
lsix
lsix approved these changes Feb 3, 2020
View reviewed changes
Copy link
Member

@lsix lsix left a comment

Choose a reason for hiding this comment

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

Nice catch.

Thanks !

@lsix lsix merged commit b07817f into NixOS:master Feb 3, 2020
@bcdarwin bcdarwin deleted the octave-disable-qscintilla branch February 3, 2020 19:42
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Feb 4, 2020
@lsix @dtzWill
Merge pull request NixOS#79161 from bcdarwin/octave-disable-qscintilla
da9f593 
octave: build without qscintilla by default
(cherry picked from commit b07817f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lsix lsix lsix approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@bcdarwin @lsix