mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 11:02:05 +00:00
Merge pull request #85460 from chkno/k3d
k3d: Fix build: Use the same GCC version for boost dependency
This commit is contained in:
commit
c9e02db236
|
@ -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 {};
|
||||
|
|
Loading…
Reference in a new issue