diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-28 10:25:45 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-28 10:25:45 +0200 |
| commit | 0d8cb297809816799f5aa33d366482c46ccb8e1d (patch) | |
| tree | 4e9e05956a5e891c423b501b569cd08710c557ce | |
| parent | 2197753dfdb25944e55c25d911ae6d14b8506c4d (diff) | |
| download | garage-build-convert-db.tar.gz garage-build-convert-db.zip | |
Nix configuration to build convert_dbbuild-convert-db
| -rw-r--r-- | default.nix | 7 | ||||
| -rw-r--r-- | nix/compile.nix | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/default.nix b/default.nix index 7e44096c..4166ec46 100644 --- a/default.nix +++ b/default.nix @@ -16,6 +16,7 @@ let name ="garage-tests"; paths = builtins.map (key: rustPkgs.workspace.${key} { compileMode = "test"; }) (builtins.attrNames rustPkgs.workspace); }); + build_convert_db = (target: (compile { inherit target git_version; release = true; }).workspace.garage_db { compileMode = "build"; }); in { pkgs = { @@ -23,6 +24,12 @@ in { i386 = build_debug_and_release "i686-unknown-linux-musl"; arm64 = build_debug_and_release "aarch64-unknown-linux-musl"; arm = build_debug_and_release "armv6l-unknown-linux-musleabihf"; + convert_db = { + amd64 = build_convert_db "x86_64-unknown-linux-musl"; + i386 = build_convert_db "i686-unknown-linux-musl"; + arm64 = build_convert_db "aarch64-unknown-linux-musl"; + arm = build_convert_db "armv6l-unknown-linux-musleabihf"; + }; }; test = { amd64 = test (compile { inherit git_version; target = "x86_64-unknown-linux-musl"; }); diff --git a/nix/compile.nix b/nix/compile.nix index adb07886..8f007b3d 100644 --- a/nix/compile.nix +++ b/nix/compile.nix @@ -149,7 +149,10 @@ let (pkgs.rustBuilder.rustLib.makeOverride { name = "garage_db"; - overrideAttrs = drv: { /* [1] */ setBuildEnv = (buildEnv drv); }; + overrideAttrs = drv: { + /* [1] */ setBuildEnv = (buildEnv drv); + /* [2] */ hardeningDisable = [ "pie" ]; + }; }) (pkgs.rustBuilder.rustLib.makeOverride { |