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: 72e80436cd6c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0daea5f19718
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 1, 2019

  1. quassel: Fix use of mkDerivation 

    The `with stdenv;` would override the `mkDerivation` to be the regular
one, instead of the libsForQt5 one.

This simply removes the dangerous use of the all-encompassing `with`,
and prefers using a more precise inherit for `lib`.

See #65399

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    @samueldr @worldofpeace
    samueldr and worldofpeace committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    c52b5b8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #67746 from samueldr/pkgs/quassel/fix-wrapQtAppsHook 

    quassel: Fix use of `mkDerivation`
    @worldofpeace
    worldofpeace committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    0daea5f View commit details
    Browse the repository at this point in the history