From 315be8d4e6b429fb8f919c7797fdaa8bf819d093 Mon Sep 17 00:00:00 2001
From: "guillem.cordoba" <guillem.cordoba@gmail.com>
Date: Thu, 12 Sep 2024 16:49:22 +0200
Subject: [PATCH] Revert commit

---
 flake.lock | 17 -----------------
 flake.nix  |  7 ++-----
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9231edb..4818964 100644
--- a/flake.lock
+++ b/flake.lock
@@ -33,22 +33,6 @@
         "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": {
@@ -193,7 +177,6 @@
           "holonix",
           "crane"
         ],
-        "gonixpkgs": "gonixpkgs",
         "holonix": "holonix",
         "nixpkgs": "nixpkgs_2",
         "rust-overlay": [
diff --git a/flake.nix b/flake.nix
index 6d84596..c61ed2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,6 @@ 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";
@@ -29,7 +27,6 @@ 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
 
@@ -37,11 +34,11 @@ rec {
               apple_sdk.frameworks.WebKit
               (pkgs.darwin.apple_sdk_11_0.stdenv.mkDerivation {
                 name = "go";
-                nativeBuildInputs = [ pkgs.makeBinaryWrapper go ];
+                nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ];
                 dontBuild = true;
                 dontUnpack = true;
                 installPhase = ''
-                  makeWrapper ${go}/bin/go $out/bin/go
+                  makeWrapper ${pkgs.go}/bin/go $out/bin/go
                 '';
               })