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: bd1c92238819
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fce2d400518e
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Sep 11, 2018

  1. qt5.qtwebkit: Fixes modules src being subtly broken. 

    b785d48 introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960

(cherry picked from commit cb38098)
    @samueldr
    samueldr committed Sep 11, 2018
    Copy the full SHA
    fce2d40 View commit details
    Browse the repository at this point in the history