diff --git a/flake.lock b/flake.lock index bce30e58f58..94ed8931096 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "nixos", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 928b165ca35..b4fd137da79 100644 --- a/flake.nix +++ b/flake.nix @@ -10,12 +10,9 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; overlays = [ ]; }; - # The current default sdk for macOS fails to compile go projects, so we use a newer one for now. - # This has no effect on other platforms. - callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage; in rec { - devShell = callPackage ./shell.nix { + devShell = pkgs.callPackage ./shell.nix { inherit pkgs; }; formatter = pkgs.nixpkgs-fmt; diff --git a/shell.nix b/shell.nix index 7b64b7f58a1..ca785283fd5 100644 --- a/shell.nix +++ b/shell.nix @@ -5,8 +5,13 @@ let postgresql = postgresql_14; nodejs = nodejs-18_x; nodePackages = pkgs.nodePackages.override { inherit nodejs; }; + + mkShell' = mkShell.override { + # The current nix default sdk for macOS fails to compile go projects, so we use a newer one for now. + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; in -mkShell { +mkShell' { nativeBuildInputs = [ go goreleaser @@ -46,7 +51,6 @@ mkShell { ]; LD_LIBRARY_PATH = "${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH"; GOROOT = "${go}/share/go"; - CGO_ENABLED = 0; PGDATA = "db"; CL_DATABASE_URL = "postgresql://chainlink:chainlink@localhost:5432/chainlink_test?sslmode=disable";