diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-03-27 07:28:40 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2020-03-27 07:28:40 +0000 |
commit | 0bba7474b3e6c8cef36960614446447d38ec04c9 (patch) | |
tree | 7db986b50cda623cbccb721e91e3d80629a69fd6 | |
parent | 4a3edb4bd75265dcc12d61e84441210586c9b60e (diff) |
go: propagate target build dependencies correctly
When using strict deps we have to use depsTargetTargetPropagated as go is added as a nativeBuildInputs to our build.
-rw-r--r-- | pkgs/development/compilers/go/1.12.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/go/1.13.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/go/1.14.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/go/1.4.nix | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 35bcfa36e9934..3b4091bf1140c 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index aa88127303230..36345bb0dab8b 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 3651b9361166d..b8038a5d9dd0c 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 0dd852a1ef168..c3c46de1fce05 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin Security; + depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; hardeningDisable = [ "all" ]; |