diff options
-rw-r--r-- | pkgs/applications/blockchains/go-ethereum.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/virtualization/containerd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/livepeer/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/trezord/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/networking/flannel/default.nix | 2 |
7 files changed, 0 insertions, 22 deletions
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index a59cffb4b1d21..07d16494646a0 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -10,9 +10,6 @@ buildGoPackage rec { propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) - hardeningDisable = [ "fortify" ]; - src = fetchFromGitHub { owner = "ethereum"; repo = pname; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index b770c6ed0a599..70865ea848b34 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -16,8 +16,6 @@ buildGoPackage rec { goPackagePath = "github.com/containerd/containerd"; outputs = [ "bin" "out" "man" ]; - hardeningDisable = [ "fortify" ]; - buildInputs = [ btrfs-progs go-md2man utillinux ]; buildFlags = "VERSION=v${version}"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9902ae2140c4d..0a61149cafcf9 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -37,8 +37,6 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; - - hardeningDisable = [ "fortify" ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -82,9 +80,6 @@ rec { sha256 = sha256; }; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 59a0f00e7c6fe..fa48c8b5e5ed2 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -18,8 +18,6 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man ]; buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 798bda8e306e5..64edcb2ef4fa9 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -18,11 +18,6 @@ buildGoPackage rec { 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; meta = with stdenv.lib; { diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 84b7b325b46f2..38fefd041bddd 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -4,9 +4,6 @@ buildGoPackage rec { pname = "trezord-go"; 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"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index f16fcc7048c8a..d2f0ec2ec634a 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -9,8 +9,6 @@ buildGoPackage rec { goPackagePath = "github.com/coreos/flannel"; - hardeningDisable = [ "fortify" ]; - src = fetchFromGitHub { inherit rev; owner = "coreos"; |