From 231d591c6c1a0d06c15c6874d2516cd94d12ba00 Mon Sep 17 00:00:00 2001 From: Spotlight Date: Sun, 24 Sep 2023 15:48:35 -0500 Subject: [PATCH] Enforce Clang stdenv for swiftformat --- flake.lock | 12 ++++++------ pkgs/default.nix | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index a7d4623..dff478a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695224363, - "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", + "lastModified": 1695550077, + "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", "owner": "nix-community", "repo": "home-manager", - "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", + "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { diff --git a/pkgs/default.nix b/pkgs/default.nix index e3403d7..0d28796 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,7 @@ self: super: { monaco-powerline = super.callPackage ./monaco-powerline/default.nix { }; - swiftformat = super.callPackage ./swiftformat.nix { }; + # Building with Swift requires using the Clang stdenv. + # For more information: https://github.com/NixOS/nixpkgs/issues/242779#issuecomment-1732558769 + swiftformat = super.callPackage ./swiftformat.nix { stdenv = self.pkgs.clangStdenv; }; }