nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-10 01:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132842 from qowoz/hashiflags

Browse Source 
nomad, vault: buildFlagsArray -> tags
This commit is contained in:
Jörg Thalheim 2021-08-06 05:54:29 +01:00 committed by GitHub
commit 54d33add5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/cluster/nomad/generic.nix
View File

@ -6,6 +6,7 @@
, nvidiaGpuSupport , nvidiaGpuSupport
, patchelf , patchelf
, nvidia_x11 , nvidia_x11
, nixosTests
}: }:
buildGoPackage rec { buildGoPackage rec {
@ -29,16 +30,7 @@ buildGoPackage rec {
# ui: # ui:
# Nomad release commits include the compiled version of the UI, but the file # Nomad release commits include the compiled version of the UI, but the file
# is only included if we build with the ui tag. # is only included if we build with the ui tag.
preBuild = tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
let
tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
tagsString = lib.concatStringsSep " " tags;
in
''
export buildFlagsArray=(
-tags="${tagsString}"
)
'';
# The dependency on NVML isn't explicit. We have to make it so otherwise the # The dependency on NVML isn't explicit. We have to make it so otherwise the
# binary will not know where to look for the relevant symbols. # binary will not know where to look for the relevant symbols.
@ -48,6 +40,8 @@ buildGoPackage rec {
done done
''; '';
passthru.tests.nomad = nixosTests.nomad;
meta = with lib; { meta = with lib; {
homepage = "https://www.nomadproject.io/"; homepage = "https://www.nomadproject.io/";
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";

2
pkgs/tools/security/vault/default.nix
View File

@ -21,7 +21,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeBuildInputs = [ installShellFiles makeWrapper ];
buildFlagsArray = [ "-tags=vault" ]; tags = [ "vault" ];
ldflags = [ ldflags = [
"-s" "-w" "-s" "-w"