Skip to content

Commit

Permalink
Merge pull request #85460 from chkno/k3d
Browse files Browse the repository at this point in the history
k3d: Fix build: Use the same GCC version for boost dependency
  • Loading branch information
7c6f434c authored Apr 24, 2020
2 parents a9a38f9 + 4328c32 commit c9e02db
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20212,7 +20212,13 @@ in
k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome2) gtkglext;
stdenv = gcc6Stdenv;
boost = boost155.override { enablePython = true; };
boost = boost155.override {
enablePython = true;
stdenv = gcc6Stdenv;
buildPackages = buildPackages // {
stdenv = gcc6Stdenv;
};
};
};

k3s = callPackage ../applications/networking/cluster/k3s {};
Expand Down

0 comments on commit c9e02db

Please sign in to comment.