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: 72cf3e856a97
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 71a2a5ae40b2
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Nov 21, 2017

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    Copy the full SHA
    5421d29 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    Copy the full SHA
    d5e3935 View commit details
  3. Copy the full SHA
    10cec93 View commit details
  4. qt4: enable parallel building

    Please let me know if it fails to build in parallel so we could fix it, because
    overwise it is a bottleneck of mass rebuilds.
    orivej committed Nov 21, 2017
    12
    Copy the full SHA
    71a2a5a View commit details
2 changes: 2 additions & 0 deletions pkgs/development/libraries/boehm-gc/default.nix
Original file line number Diff line number Diff line change
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
mv $out/share/gc $out/share/doc/gc
'';

enableParallelBuilding = true;

meta = {
description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";

2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-4.x/4.8/default.nix
Original file line number Diff line number Diff line change
@@ -164,7 +164,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ perl pkgconfig which ];

enableParallelBuilding = false;
enableParallelBuilding = true;

NIX_CFLAGS_COMPILE =
optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
2 changes: 2 additions & 0 deletions pkgs/development/libraries/science/math/atlas/default.nix
Original file line number Diff line number Diff line change
@@ -100,6 +100,8 @@ stdenv.mkDerivation {
fi
'';

enableParallelBuilding = true;

meta = {
homepage = http://math-atlas.sourceforge.net/;
description = "Automatically Tuned Linear Algebra Software (ATLAS)";
2 changes: 2 additions & 0 deletions pkgs/misc/emulators/retroarch/cores.nix
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ let
--add-flags "-L $COREDIR/${d2u core}_libretro.so $@"
'';

enableParallelBuilding = true;

passthru = {
core = core;
libretroCore = "/lib/retroarch/cores";