Skip to content

Commit

Permalink
Remove openssl from flake
Browse files Browse the repository at this point in the history
After the migration to the aws sdk this is no longer needed.
  • Loading branch information
aaronmondal committed Nov 20, 2023
1 parent 6ce11ab commit 00ed990
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 35 deletions.
13 changes: 1 addition & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@
imports = [ inputs.pre-commit-hooks.flakeModule ];
perSystem = { config, self', inputs', pkgs, system, ... }:
let
# Link OpenSSL statically into the openssl-sys crate.
openssl_static = pkgs.openssl.override { static = true; };

# Wrap Bazel so that the Cargo build can see OpenSSL from nixpkgs.
bazel = import ./tools/wrapped-bazel.nix {
openssl = openssl_static;
bazel = pkgs.bazel;
writeShellScriptBin = pkgs.writeShellScriptBin;
};

hooks = import ./tools/pre-commit-hooks.nix { inherit pkgs; };
in
{
Expand All @@ -32,8 +22,7 @@
pkgs.cargo
pkgs.rustc
pkgs.pre-commit
openssl_static # Required explicitly for cargo test support.
bazel
pkgs.bazel
pkgs.awscli2
];
shellHook = ''
Expand Down
23 changes: 0 additions & 23 deletions tools/wrapped-bazel.nix

This file was deleted.

0 comments on commit 00ed990

Please sign in to comment.