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

Commits on Jan 20, 2018

  1. qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE 

    If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags
along with the common flags.

See also: #34039 #34038 #33935 #33933 #33930 #33927
    @ttuegel
    ttuegel committed Jan 20, 2018
    Copy the full SHA
    c1720b4 View commit details
    Browse the repository at this point in the history

  2. qt5: debug flag should never be null

    @ttuegel
    ttuegel committed Jan 20, 2018
    Copy the full SHA
    4a39533 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #34047 from ttuegel/bugfix/qt-5/NIX_CFLAGS_COMPILE 

    Qt 5: Fix debug flags
    Thomas Tuegel committed Jan 20, 2018
    Copy the full SHA
    88464ec View commit details
    Browse the repository at this point in the history