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

qscintilla: Fix qt4 build #70391

Merged
merged 1 commit into from Oct 22, 2019
Merged

qscintilla: Fix qt4 build #70391

merged 1 commit into from Oct 22, 2019

Conversation

lsix
Copy link
Member

@lsix lsix commented Oct 4, 2019 •
edited

Motivation for this change

qscintilla (with qt4) is marked as broken, but is required for octave.

This PR fixes that to make octave build again.

cc @peterhoeg

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 @

@lsix lsix requested a review from peterhoeg October 4, 2019 12:14
@matthuszagh matthuszagh mentioned this pull request Oct 21, 2019
Closed
10 tasks
@das-g
Copy link
Member

das-g commented Oct 21, 2019

Can we get this merged and backported to NixOS 19.09? Other applications like QGIS are also currently unavailable in NixOS 19.09 due to this.

@peterhoeg peterhoeg merged commit 9f05eb0 into NixOS:master Oct 22, 2019
@peterhoeg
Copy link
Member

Can I trouble one of you to do a git cherry-pick -x [commit] and open a PR for the backport please?

@das-g
Copy link
Member

das-g commented Oct 22, 2019

Can I trouble one of you to do a git cherry-pick -x [commit] and open a PR for the backport please?

On it.

@das-g das-g mentioned this pull request Oct 22, 2019
Merged
10 tasks
@das-g
Copy link
Member

das-g commented Oct 22, 2019

Backport to 19.09: #71646

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@das-g das-g das-g approved these changes

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

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
3 participants
@lsix @das-g @peterhoeg