stop using hardeningDisable = [ "fortify" ]; for Go packages
it seems that the issue #25959 is not present anymore
This commit is contained in:
parent
e59c610d58
commit
afd38ea1ee
@ -10,9 +10,6 @@ buildGoPackage rec {
|
|||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
|
stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
|
||||||
|
|
||||||
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ethereum";
|
owner = "ethereum";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
|
@ -16,8 +16,6 @@ buildGoPackage rec {
|
|||||||
goPackagePath = "github.com/containerd/containerd";
|
goPackagePath = "github.com/containerd/containerd";
|
||||||
outputs = [ "bin" "out" "man" ];
|
outputs = [ "bin" "out" "man" ];
|
||||||
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
buildInputs = [ btrfs-progs go-md2man utillinux ];
|
buildInputs = [ btrfs-progs go-md2man utillinux ];
|
||||||
buildFlags = "VERSION=v${version}";
|
buildFlags = "VERSION=v${version}";
|
||||||
|
|
||||||
|
@ -37,8 +37,6 @@ rec {
|
|||||||
rev = containerdRev;
|
rev = containerdRev;
|
||||||
sha256 = containerdSha256;
|
sha256 = containerdSha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
});
|
});
|
||||||
|
|
||||||
docker-tini = tini.overrideAttrs (oldAttrs: {
|
docker-tini = tini.overrideAttrs (oldAttrs: {
|
||||||
@ -82,9 +80,6 @@ rec {
|
|||||||
sha256 = sha256;
|
sha256 = sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Optimizations break compilation of libseccomp c bindings
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
makeWrapper removeReferencesTo go-md2man go libtool
|
makeWrapper removeReferencesTo go-md2man go libtool
|
||||||
|
@ -18,8 +18,6 @@ buildGoPackage rec {
|
|||||||
|
|
||||||
outputs = [ "bin" "out" "man" ];
|
outputs = [ "bin" "out" "man" ];
|
||||||
|
|
||||||
# Optimizations break compilation of libseccomp c bindings
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
nativeBuildInputs = [ pkgconfig go-md2man ];
|
nativeBuildInputs = [ pkgconfig go-md2man ];
|
||||||
|
|
||||||
buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ];
|
buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ];
|
||||||
|
@ -18,11 +18,6 @@ buildGoPackage rec {
|
|||||||
|
|
||||||
buildInputs = [ pkgconfig ffmpeg ];
|
buildInputs = [ pkgconfig ffmpeg ];
|
||||||
|
|
||||||
# XXX This removes the -O2 flag, to avoid errors like:
|
|
||||||
# cgo-dwarf-inference:2:8: error: enumerator value for '__cgo_enum__0' is not an integer constant
|
|
||||||
# This is a workaround for nixpkgs+golang BUG https://github.com/NixOS/nixpkgs/issues/25959
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -4,9 +4,6 @@ buildGoPackage rec {
|
|||||||
pname = "trezord-go";
|
pname = "trezord-go";
|
||||||
version = "2.0.27";
|
version = "2.0.27";
|
||||||
|
|
||||||
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
goPackagePath = "github.com/trezor/trezord-go";
|
goPackagePath = "github.com/trezor/trezord-go";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -9,8 +9,6 @@ buildGoPackage rec {
|
|||||||
|
|
||||||
goPackagePath = "github.com/coreos/flannel";
|
goPackagePath = "github.com/coreos/flannel";
|
||||||
|
|
||||||
hardeningDisable = [ "fortify" ];
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
inherit rev;
|
inherit rev;
|
||||||
owner = "coreos";
|
owner = "coreos";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user