3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #108618 from marsam/fix-nomad-darwin

nomad: fix build on darwin
This commit is contained in:
Mario Rodas 2021-01-06 17:50:10 -05:00 committed by GitHub
commit 1f298dbc18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6140,17 +6140,17 @@ in
nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix {
buildGoPackage = buildGo114Package; buildGoPackage = buildGo114Package;
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
nvidiaGpuSupport = config.cudaSupport or (!stdenv.isLinux); nvidiaGpuSupport = config.cudaSupport or false;
}; };
nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix {
buildGoPackage = buildGo114Package; buildGoPackage = buildGo114Package;
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
nvidiaGpuSupport = config.cudaSupport or (!stdenv.isLinux); nvidiaGpuSupport = config.cudaSupport or false;
}; };
nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix {
buildGoPackage = buildGo115Package; buildGoPackage = buildGo115Package;
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
nvidiaGpuSupport = config.cudaSupport or (!stdenv.isLinux); nvidiaGpuSupport = config.cudaSupport or false;
}; };
notable = callPackage ../applications/misc/notable { }; notable = callPackage ../applications/misc/notable { };