|
14 | 14 |
|
15 | 15 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; |
16 | 16 |
|
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 | | - |
20 | 17 | devenv = { |
21 | 18 | url = "github:cachix/devenv"; |
22 | 19 | inputs.nixpkgs.follows = "nixpkgs"; |
|
38 | 35 | }; |
39 | 36 | }; |
40 | 37 |
|
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; } { |
42 | 39 | imports = [ |
43 | 40 | inputs.devenv.flakeModule |
44 | 41 | ]; |
45 | 42 | systems = nixpkgs.lib.systems.flakeExposed; |
46 | 43 |
|
47 | 44 | perSystem = {system, pkgs, self', ...}: let |
48 | | - pkgs-glibc237 = import nixpkgs-glibc237 { |
49 | | - inherit system; |
50 | | - }; |
51 | 45 | pkgs-fenix = import nixpkgs { |
52 | 46 | inherit system; |
53 | 47 | overlays = [ fenix.overlays.default ]; |
54 | 48 | }; |
55 | 49 | in { |
56 | 50 | 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 |
59 | 53 | in rec { |
60 | 54 | default = honggfuzz-rs; |
61 | 55 | honggfuzz-rs = craneLib.buildPackage { |
62 | 56 | src = craneLib.cleanCargoSource (craneLib.path ./.); |
| 57 | + hardeningDisable = [ "fortify" ]; |
63 | 58 | }; |
64 | 59 | }; |
65 | 60 |
|
66 | 61 | devenv.shells.default = { |
67 | | - stdenv = pkgs-glibc237.stdenv; |
68 | | - |
69 | | - packages = with pkgs-glibc237; [ |
| 62 | + packages = with pkgs; [ |
70 | 63 | libbfd |
71 | 64 | bintools-unwrapped |
72 | 65 | libunwind |
73 | | - |
74 | | - cargo |
75 | | - rustc |
76 | 66 | ]; |
77 | 67 |
|
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 | + }; |
84 | 78 | }; |
85 | 79 | }; |
86 | 80 | }; |
|
0 commit comments