Skip to content

Commit

Permalink
Fixed holochain go deps
Browse files Browse the repository at this point in the history
  • Loading branch information
guillemcordoba committed Sep 6, 2024
1 parent a3266b7 commit be92a6d
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 13 deletions.
31 changes: 24 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,30 @@ rec {
flake = {
lib = rec {
holochainDeps = { pkgs, lib }:
(with pkgs; [ perl go openssl ])
++ (lib.optionals pkgs.stdenv.isLinux [ pkgs.pkg-config ])
++ (lib.optionals pkgs.stdenv.isDarwin [
pkgs.libiconv
pkgs.darwin.apple_sdk.frameworks.Security
pkgs.darwin.apple_sdk_11_0.frameworks.CoreFoundation
]);
(with pkgs; [ perl openssl ])
++ (lib.optionals pkgs.stdenv.isLinux [ pkgs.pkg-config pkgs.go ])
++ (let
apple_sdk = if pkgs.system == "x86_64-darwin" then
pkgs.darwin.apple_sdk_10_12
else
pkgs.darwin.apple_sdk_11_0;
in (pkgs.lib.optionals pkgs.stdenv.isDarwin [
apple_sdk.frameworks.AppKit
apple_sdk.frameworks.WebKit

(if pkgs.system == "x86_64-darwin" then
pkgs.darwin.apple_sdk_11_0.stdenv.mkDerivation {
name = "go";
nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ];
dontBuild = true;
dontUnpack = true;
installPhase = ''
makeWrapper ${pkgs.go}/bin/go $out/bin/go
'';
}
else
pkgs.go)
]));

filterByHolochainPackageType = holochainPackageType: packages:
inputs.nixpkgs.lib.filterAttrs (key: value:
Expand Down
10 changes: 5 additions & 5 deletions nix/fixtures/module-repo/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/fixtures/module-repo/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"start": "node index.js"
},
"dependencies": {
"@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#112ac7c452d5a5c775a07a072c0ee14cb81c41ed&path:ui"
"@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#6000dc6c04194429f2768517670366c411c4a03a&path:ui"
},
"exports": {
".": "./index.js"
Expand Down

0 comments on commit be92a6d

Please sign in to comment.