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: 7e1f60dfbba6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 10e175a275f7
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 2, 2020

  1. qarte: use qt5’s mkDerivation 

    See #65399

(cherry picked from commit e063d08)
    @vbgl @ahiaao
    vbgl authored and ahiaao committed Feb 2, 2020
    Copy the full SHA
    0907482 View commit details
    Browse the repository at this point in the history

  2. qarte: use pyqt5_with_qtmultimedia 

    Otherwise, qarte fails at run-time with:

>     from PyQt5.QtMultimedia import QMediaPlayer
> ModuleNotFoundError: No module named 'PyQt5.QtMultimedia'

(cherry picked from commit ef15478)
    @vbgl @ahiaao
    vbgl authored and ahiaao committed Feb 2, 2020
    Copy the full SHA
    723af8f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #73547 from ahiaao/qarte+fix-qt-platform-backport 

    quarte: use qt5’s mkDerivation and an other fix 19.09 backport
    @worldofpeace
    worldofpeace committed Feb 2, 2020
    Copy the full SHA
    10e175a View commit details
    Browse the repository at this point in the history