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: 52ffec321aa3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0024cfcc4956
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 17, 2019

  1. merkaartor: fix build 

    Merkaartor is not compatible with current version of Qt5 (5.12)
but is known to work with version 5.9
    @vbgl
    vbgl committed Jun 17, 2019
    Copy the full SHA
    e955576 View commit details
    Browse the repository at this point in the history

  2. merkaartor: fix run-time loading of Qt 5 platform 

    Without this patch, running merkaartor fails with the following message:
“This application failed to start because it could not find or load the Qt
platform plugin "xcb"”.
    @vbgl
    vbgl committed Jun 17, 2019
    Copy the full SHA
    462c438 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. Merge pull request #63346 from vbgl/merkaartor-fix 

    merkaartor: fix build & run
    @vbgl
    vbgl committed Jun 26, 2019
    Copy the full SHA
    0024cfc View commit details
    Browse the repository at this point in the history