Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 1098c071e59c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 09cf3506fa4c
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Feb 18, 2018

  1. qtEnv: fix paths in qt.conf 

    The shell variables from setup hook are not visible here, so instead substitute
them from Nix side.
    @abbradar @bjornfor
    abbradar authored and bjornfor committed Feb 18, 2018
    Copy the full SHA
    4490140 View commit details
    Browse the repository at this point in the history

  2. qtcreator: fix path to qtquickcontrols 

    This enables build of QML designer plugin.
    @abbradar @bjornfor
    abbradar authored and bjornfor committed Feb 18, 2018
    Copy the full SHA
    9c88273 View commit details
    Browse the repository at this point in the history

  3. qt5X.full: add "-full" to package name 

    This aligns the package name more with the attrname.

This is a re-application of the idea behind 7405af7
("qt: make package names of "full" variants appear as such"), which
seems to have been lost on the way.
    @bjornfor
    bjornfor committed Feb 18, 2018
    Copy the full SHA
    09cf350 View commit details
    Browse the repository at this point in the history