diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-03-27 07:33:21 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2020-03-27 07:33:21 +0000 |
commit | 066db11215a2287a88a80ec71595cd8764563444 (patch) | |
tree | 9b463617906764f1e824df6f56f7721d475f3a71 /pkgs/applications/networking/cluster/argo | |
parent | 0bba7474b3e6c8cef36960614446447d38ec04c9 (diff) | |
download | nixpkgs-066db11215a2287a88a80ec71595cd8764563444.tar nixpkgs-066db11215a2287a88a80ec71595cd8764563444.tar.gz nixpkgs-066db11215a2287a88a80ec71595cd8764563444.tar.bz2 nixpkgs-066db11215a2287a88a80ec71595cd8764563444.tar.lz nixpkgs-066db11215a2287a88a80ec71595cd8764563444.tar.xz nixpkgs-066db11215a2287a88a80ec71595cd8764563444.tar.zst nixpkgs-066db11215a2287a88a80ec71595cd8764563444.zip |
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
This reverts commit 4e6bf03504c9e09f067cc6dee6b5aeec43a1405c, reversing changes made to afd997aab6e9b7a322198092c7828d6c560ac06f. Instead we propagate those frameworks from the compiler again
Diffstat (limited to 'pkgs/applications/networking/cluster/argo')
-rw-r--r-- | pkgs/applications/networking/cluster/argo/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 25fb33399c0..f02b64e92c8 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -32,8 +32,6 @@ buildGoModule rec { subPackages = [ "cmd/argo" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' mkdir -p ui/dist/app echo "Built without static files" > ui/dist/app/index.html @@ -41,7 +39,7 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Container native workflow engine for Kubernetes"; homepage = https://github.com/argoproj/argo; license = licenses.asl20; |