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

various: use qt5's mkDerivation #80982

Merged
merged 4 commits into from Feb 26, 2020
Merged

various: use qt5's mkDerivation #80982

merged 4 commits into from Feb 26, 2020

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change
Things done

Made sure the binaries at $out/bin were wrappers.

  • 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.

@worldofpeace worldofpeace added the 9.needs: port to stable A PR needs a backport to the stable release. label Feb 24, 2020
@worldofpeace
Copy link
Contributor Author

Will be backported to 19.09 and 20.03.

@worldofpeace worldofpeace mentioned this pull request Feb 24, 2020
Closed
@ofborg ofborg bot requested review from acowley and mgttlinger February 24, 2020 21:21
cole-h
cole-h reviewed Feb 25, 2020
View reviewed changes
pkgs/applications/graphics/qview/default.nix
nativeBuildInputs = [ qmake ];

buildInputs = [
qtbase
Copy link
Member

Choose a reason for hiding this comment

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

Doesn't make much difference, but why not have this on one line, like the above nativeBuildInputs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I prefer to have all lists like to have one item per line. I just forgot to do the above one.

mgttlinger
mgttlinger approved these changes Feb 25, 2020
View reviewed changes
Copy link
Member

@mgttlinger mgttlinger left a comment

Choose a reason for hiding this comment

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

LGTM

@worldofpeace worldofpeace merged commit 705afab into NixOS:master Feb 26, 2020
@worldofpeace worldofpeace deleted the qt-derivation-fixes branch February 26, 2020 01:11
@worldofpeace
Copy link
Contributor Author

So I was looking through the git history, and I noticed that I already had this fixed on master and in 19.09 for seafile-client in #67270. I tried backporting the change to 19.09 and got very confused 🤣 This explains why this regressed #80976 (comment). Apparently the changes got reverted in 20.03 and master from 94e35fb. @infinisil Please be sure to use the qt version of the deriver in qt apps.

Backported to 20.03 in:
7e9bdd9
d343ab8
309dee9
2424e5f

Backported to 19.09 in:
❌️ 43bb5bf
edaeeb2
d8ef510
7213a44

@worldofpeace worldofpeace mentioned this pull request Feb 26, 2020
Closed
@infinisil
Copy link
Member

Whoops sorry, will keep an eye out for that!

dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Feb 26, 2020
@worldofpeace @dtzWill
Merge pull request NixOS#80982 from worldofpeace/qt-derivation-fixes
e391cc6 
various: use qt5's mkDerivation
(cherry picked from commit 705afab)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h left review comments

@acowley acowley acowley approved these changes

@mgttlinger mgttlinger mgttlinger approved these changes

Assignees
No one assigned
Labels
9.needs: port to stable A PR needs a backport to the stable release. 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
5 participants
@worldofpeace @infinisil @acowley @mgttlinger @cole-h