Skip to content

Commit 0351769

Browse files
flake: disable fortify hardening
1 parent 93b46ee commit 0351769

File tree

2 files changed

+16
-39
lines changed

2 files changed

+16
-39
lines changed

flake.lock

Lines changed: 1 addition & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
1616

17-
# this is the last version with glibc <= 2.37. Newer versions of glibc make honggfuzz fail to build, see https://github.com/google/honggfuzz/issues/518
18-
nixpkgs-glibc237.url = "github:NixOS/nixpkgs/nixos-23.05";
19-
2017
devenv = {
2118
url = "github:cachix/devenv";
2219
inputs.nixpkgs.follows = "nixpkgs";
@@ -38,49 +35,46 @@
3835
};
3936
};
4037

41-
outputs = inputs @ {flake-parts, nixpkgs, nixpkgs-glibc237, fenix, crane, ...}: flake-parts.lib.mkFlake { inherit inputs; } {
38+
outputs = inputs @ {flake-parts, nixpkgs, fenix, crane, ...}: flake-parts.lib.mkFlake { inherit inputs; } {
4239
imports = [
4340
inputs.devenv.flakeModule
4441
];
4542
systems = nixpkgs.lib.systems.flakeExposed;
4643

4744
perSystem = {system, pkgs, self', ...}: let
48-
pkgs-glibc237 = import nixpkgs-glibc237 {
49-
inherit system;
50-
};
5145
pkgs-fenix = import nixpkgs {
5246
inherit system;
5347
overlays = [ fenix.overlays.default ];
5448
};
5549
in {
5650
packages = let
57-
craneLib = crane.mkLib pkgs;
58-
#craneLib = (crane.mkLib pkgs-fenix).overrideToolchain (p: p.fenix.minimal.toolchain); # rust nightly
51+
#craneLib = crane.mkLib pkgs;
52+
craneLib = (crane.mkLib pkgs-fenix).overrideToolchain (p: p.fenix.minimal.toolchain); # rust nightly
5953
in rec {
6054
default = honggfuzz-rs;
6155
honggfuzz-rs = craneLib.buildPackage {
6256
src = craneLib.cleanCargoSource (craneLib.path ./.);
57+
hardeningDisable = [ "fortify" ];
6358
};
6459
};
6560

6661
devenv.shells.default = {
67-
stdenv = pkgs-glibc237.stdenv;
68-
69-
packages = with pkgs-glibc237; [
62+
packages = with pkgs; [
7063
libbfd
7164
bintools-unwrapped
7265
libunwind
73-
74-
cargo
75-
rustc
7666
];
7767

78-
# languages = {
79-
# rust = {
80-
# enable = true;
81-
# channel = "stable";
82-
# };
83-
# };
68+
env = {
69+
NIX_HARDENING_ENABLE = "";
70+
};
71+
72+
languages = {
73+
rust = {
74+
enable = true;
75+
channel = "nightly";
76+
};
77+
};
8478
};
8579
};
8680
};

0 commit comments

Comments
 (0)