JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #85460 from chkno/k3d

Browse Source 
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
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
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 {};