1
0
Fork 1
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:
Michael Raskin 2020-04-24 15:13:30 +00:00 committed by GitHub
commit c9e02db236
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 {};