Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: cd1b649e118e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: feaf8ac4632c
Choose a head ref
  • 9 commits
  • 12 files changed
  • 1 contributor

Commits on Apr 8, 2019

  1. xcbuild: provide migcom in toolchain

    This is needed to facilitate build of qt5.qtwebengine on darwin
    
    (cherry picked from commit 7a6d18c)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    890e1b1 View commit details
    Browse the repository at this point in the history
  2. qt511.qtwebengine: fix build on darwin

    Co-Authored-By: Josef Kemetmüller <josef.kemetmueller@gmail.com>
    (cherry picked from commit 45ab55e)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    1de00e3 View commit details
    Browse the repository at this point in the history
  3. qt5.qtwebengine: don't propagate cups dependency

    (cherry picked from commit ecbb9d3)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    8afd782 View commit details
    Browse the repository at this point in the history
  4. qt5.qtwebengine: refactor to use lib.versionOlder

    (cherry picked from commit 56dcf6e)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    490a7c4 View commit details
    Browse the repository at this point in the history
  5. qt5.qtwebengine: disable platform check using patches

    The previous code using substituteInPlace was broken for both 5.9 and
    5.11 (latter was broken after a minor release bump). Using patches
    should make things fail loudly and prevent modules/qtwebengine.nix from
    being littered with version checks.
    
    (cherry picked from commit 1809832)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    17ef55f View commit details
    Browse the repository at this point in the history
  6. qt5.qtwebengine: refactor more things to use patches instead of subst…

    …ituteInPlace
    
    qt59.qtwebengine doesn't need those fixes (probably since the recent
    minor version bump)
    
    (cherry picked from commit ccd1bf6)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    f72758d View commit details
    Browse the repository at this point in the history
  7. qt59.qtwebengine: fix on darwin

    This ports a patch that is already used in 5.11. Also one of the
    substituteInPlace call fails because a file doesn't exist.
    
    (cherry picked from commit 0624deb)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    1b61f95 View commit details
    Browse the repository at this point in the history
  8. qt5.qtwebengine: fail properly

    QtWebEngine's build system is setup to perform certain platform checks
    (see mkspecs/features/platform.prf). But a failed check will not cause
    configuration phase to fail, but instead it configures no build targets.
    So in such case the build will successfully perform build and install
    phases. An empty output directories will are produced and the build
    succeeds.
    
    This patches qtwebengine qmake files to properly fail during
    configuration phase.
    
    This doesn't touch qt56 as it doesn't have this mechanism.
    
    (cherry picked from commit 3e3e391)
    veprbl committed Apr 8, 2019
    Copy the full SHA
    f2082ef View commit details
    Browse the repository at this point in the history
  9. qt511.qtwebengine: fix eval

    veprbl committed Apr 8, 2019
    Copy the full SHA
    feaf8ac View commit details
    Browse the repository at this point in the history