diff --git a/flake.nix b/flake.nix index be967e0..4453cf8 100644 --- a/flake.nix +++ b/flake.nix @@ -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: diff --git a/nix/fixtures/module-repo/pnpm-lock.yaml b/nix/fixtures/module-repo/pnpm-lock.yaml index 24f05d6..2ad77ec 100644 --- a/nix/fixtures/module-repo/pnpm-lock.yaml +++ b/nix/fixtures/module-repo/pnpm-lock.yaml @@ -11,8 +11,8 @@ importers: ui: dependencies: '@holochain-open-dev/profiles': - specifier: github:holochain-open-dev/profiles#112ac7c452d5a5c775a07a072c0ee14cb81c41ed&path:ui - version: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/112ac7c452d5a5c775a07a072c0ee14cb81c41ed#path:ui(@types/react@18.3.3) + specifier: github:holochain-open-dev/profiles#6000dc6c04194429f2768517670366c411c4a03a&path:ui + version: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/6000dc6c04194429f2768517670366c411c4a03a#path:ui(@types/react@18.3.3) packages: @@ -41,8 +41,8 @@ packages: '@holochain-open-dev/elements@0.300.1': resolution: {integrity: sha512-i0BYvrM+aKFlyiNQ02mkqTElLxQ4AFM0nBs4whXrb/p7XU/SQm0dApieEGMsTgtZu8cI/ZgmPzi6qQSduXXLPA==} - '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/112ac7c452d5a5c775a07a072c0ee14cb81c41ed#path:ui': - resolution: {path: ui, tarball: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/112ac7c452d5a5c775a07a072c0ee14cb81c41ed} + '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/6000dc6c04194429f2768517670366c411c4a03a#path:ui': + resolution: {path: ui, tarball: https://codeload.github.com/holochain-open-dev/profiles/tar.gz/6000dc6c04194429f2768517670366c411c4a03a} version: 0.300.0 '@holochain-open-dev/signals@0.300.7': @@ -249,7 +249,7 @@ snapshots: - bufferutil - utf-8-validate - '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/112ac7c452d5a5c775a07a072c0ee14cb81c41ed#path:ui(@types/react@18.3.3)': + '@holochain-open-dev/profiles@https://codeload.github.com/holochain-open-dev/profiles/tar.gz/6000dc6c04194429f2768517670366c411c4a03a#path:ui(@types/react@18.3.3)': dependencies: '@holochain-open-dev/elements': 0.300.1(@types/react@18.3.3) '@holochain-open-dev/signals': 0.300.7(@types/react@18.3.3) diff --git a/nix/fixtures/module-repo/ui/package.json b/nix/fixtures/module-repo/ui/package.json index 32824d7..0f4fcc8 100644 --- a/nix/fixtures/module-repo/ui/package.json +++ b/nix/fixtures/module-repo/ui/package.json @@ -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"