Skip to content

Commit 51c7fec

Browse files
committed
Update NixOS to 25.05
1 parent 8a88a52 commit 51c7fec

File tree

3 files changed

+58
-45
lines changed

3 files changed

+58
-45
lines changed

flake.lock

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

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
};
1414
# blst fails to build for x86_64-darwin
1515
# nixpkgs.follows = "haskellNix/nixpkgs-unstable";
16-
nixpkgs.url = "github:NixOS/nixpkgs/34b4e989477310bde8e4972c6595e46f98745f87";
16+
nixpkgs.url = "github:NixOS/nixpkgs/11cb3517b3af6af300dd6c055aeda73c9bf52c48";
1717
iohkNix.url = "github:input-output-hk/iohk-nix";
1818
flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs";
1919
pre-commit-hooks.url = "github:cachix/git-hooks.nix";

nix/proto-to-js.nix

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@
1515
};
1616

1717
cardano-rpc-src = ../cardano-rpc;
18+
19+
protoc-gen-js-fixed = pkgs.protoc-gen-js.overrideAttrs (old: {
20+
postPatch =
21+
(old.postPatch or "")
22+
+ ''
23+
echo "build --copt=-Dfdopen=fdopen" >> .bazelrc
24+
echo "build --copt=-Wno-deprecated-non-prototype" >> .bazelrc
25+
echo "build --copt=-Wno-macro-redefined" >> .bazelrc
26+
echo "build --host_copt=-Dfdopen=fdopen" >> .bazelrc
27+
echo "build --host_copt=-Wno-deprecated-non-prototype" >> .bazelrc
28+
echo "build --host_copt=-Wno-macro-redefined" >> .bazelrc
29+
'';
30+
});
1831
in
1932
pkgs.stdenv.mkDerivation {
2033
pname = "cardano-rpc-proto-js-bundle";
@@ -25,7 +38,7 @@ in
2538
nativeBuildInputs = [
2639
pkgs.grpc-tools
2740
pkgs.protobuf
28-
pkgs.protoc-gen-js
41+
protoc-gen-js-fixed
2942
pkgs.protoc-gen-grpc-web
3043
pkgs.nodePackages.browserify
3144
];

0 commit comments

Comments
 (0)