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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52c06182eb21
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 786946a9523c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 30, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    Copy the full SHA
    321bc32 View commit details

Commits on Apr 17, 2020

  1. Merge pull request #83782 from mkg20001/krita-fix

    krita: disable parallel building #35359
    worldofpeace authored Apr 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    786946a View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/applications/graphics/krita/default.nix
3 changes: 3 additions & 0 deletions pkgs/applications/graphics/krita/default.nix
Original file line number Diff line number Diff line change
@@ -17,6 +17,9 @@ mkDerivation rec {
sha256 = "1sx4j4brk71bas3cpqzk4bd8bknyl3x4fdg5pv4r7pcfd3vpq2vy";
};

# *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359
enableParallelBuilding = false;

nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];

buildInputs = [