-
Notifications
You must be signed in to change notification settings - Fork 73
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use protoc from nix when available #1558
Changes from 7 commits
71da792
0a584af
9a8abe4
e2be654
639cb89
0f14e3a
78b08f2
91a6a33
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,31 +2,31 @@ | |
inputs.nixpkgs.url = "github:nixos/nixpkgs"; | ||
inputs.flake-utils.url = "github:numtide/flake-utils"; | ||
|
||
outputs = { self, nixpkgs, flake-utils, ... }@inputs: | ||
outputs = { nixpkgs, flake-utils, ... }: | ||
flake-utils.lib.eachDefaultSystem (system: | ||
let | ||
pkgs = import nixpkgs { inherit system; }; | ||
shellPackages = [ | ||
"jre" | ||
"sbt" | ||
"nodejs-16_x" | ||
"yarn" | ||
shellPackages = with pkgs; [ | ||
temurin-jre-bin-17 | ||
nodejs-18_x | ||
yarn | ||
(pkgs.sbt.override { jre = pkgs.temurin-jre-bin-17; }) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. thought: I had to override the I then decided to completely drop the idea of |
||
]; | ||
in | ||
{ | ||
devShells.default = pkgs.mkShell { | ||
buildInputs = map (pkgName: pkgs.${pkgName}) shellPackages; | ||
nativeBuildInputs = [ pkgs.openssl pkgs.zlib ]; | ||
buildInputs = shellPackages; | ||
nativeBuildInputs = [ pkgs.openssl pkgs.zlib pkgs.protobuf3_21 ]; | ||
welcomeMessage = '' | ||
Welcome to the smithy4s Nix shell! 👋 | ||
Available packages: | ||
${builtins.concatStringsSep "\n" (map (n : "- ${n}") shellPackages)} | ||
${builtins.concatStringsSep "\n" (map (n : "- ${n.name}") shellPackages)} | ||
''; | ||
|
||
shellHook = '' | ||
echo "$welcomeMessage" | ||
''; | ||
LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib"; | ||
PROTOC_PATH = pkgs.lib.getExe pkgs.protobuf3_21; | ||
kubukoz marked this conversation as resolved.
Show resolved
Hide resolved
ghostbuster91 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
} | ||
); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thought: I replaced default
jre
with the same one that is used on the CI