diff --git a/flake.lock b/flake.lock index 4818964..9231edb 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,22 @@ "type": "github" } }, + "gonixpkgs": { + "locked": { + "lastModified": 1668086072, + "narHash": "sha256-msFoXI5ThCmhTTqgl27hpCXWhaeqxphBaleJAgD8JYM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "72d8853228c9758820c39b8659415b6d89279493", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "72d8853228c9758820c39b8659415b6d89279493", + "type": "github" + } + }, "hc-launch": { "flake": false, "locked": { @@ -177,6 +193,7 @@ "holonix", "crane" ], + "gonixpkgs": "gonixpkgs", "holonix": "holonix", "nixpkgs": "nixpkgs_2", "rust-overlay": [ diff --git a/flake.nix b/flake.nix index c61ed2c..6d84596 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,8 @@ rec { inputs = { # nixpkgs.follows = "holonix/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + gonixpkgs.url = + "github:nixos/nixpkgs/72d8853228c9758820c39b8659415b6d89279493"; holonix.url = "github:holochain/holonix/main-0.3"; rust-overlay.follows = "holonix/rust-overlay"; @@ -27,6 +29,7 @@ rec { pkgs.darwin.apple_sdk_10_12 else pkgs.darwin.apple_sdk_11_0; + go = inputs.gonixpkgs.legacyPackages.${pkgs.system}.go_1_17; in (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv @@ -34,11 +37,11 @@ rec { apple_sdk.frameworks.WebKit (pkgs.darwin.apple_sdk_11_0.stdenv.mkDerivation { name = "go"; - nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ]; + nativeBuildInputs = [ pkgs.makeBinaryWrapper go ]; dontBuild = true; dontUnpack = true; installPhase = '' - makeWrapper ${pkgs.go}/bin/go $out/bin/go + makeWrapper ${go}/bin/go $out/bin/go ''; })