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: 768336a74b95
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4a62576c12c4
Choose a head ref
  • 5 commits
  • 8 files changed
  • 1 contributor

Commits on Feb 20, 2019

  1. qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead o… 

    …f /usr/lib

The impure library was introduced in

   775531c ('qt58: extend darwin compatibility')

cmake-based build can use a non-apple ICU if -DMACOS_USE_SYSTEM_ICU=OFF
is set.
    @veprbl
    veprbl committed Feb 20, 2019
    Copy the full SHA
    f212dd2 View commit details
    Browse the repository at this point in the history

  2. qt5.qtwebkit: refactor version comparison 

    This introduces usingAnnulenWebkitFork variable. Using version
check for qtbase.version is misleading because annulen's fork is not
tied to a specific qt5 release.
    @veprbl
    veprbl committed Feb 20, 2019
    Copy the full SHA
    67186de View commit details
    Browse the repository at this point in the history

  3. qt511.qtwebkit: fix on darwin 

    readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.
    @veprbl
    veprbl committed Feb 20, 2019
    Copy the full SHA
    4bbd00e View commit details
    Browse the repository at this point in the history

  4. qt5.qtwebkit: don't set qmake variables for cmake build

    @veprbl
    veprbl committed Feb 20, 2019
    Copy the full SHA
    518f997 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2019

  1. Merge pull request #55983 from veprbl/pr/qt5_qtwebkit_darwin_fix 

    qt511.qtwebkit: fix on darwin
    @veprbl
    veprbl committed Mar 3, 2019
    Copy the full SHA
    4a62576 View commit details
    Browse the repository at this point in the history