diff --git a/pkgs/default.nix b/pkgs/default.nix index 0d28796..e3403d7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,5 @@ self: super: { monaco-powerline = super.callPackage ./monaco-powerline/default.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; }; + swiftformat = super.callPackage ./swiftformat.nix { }; } diff --git a/pkgs/swiftformat.nix b/pkgs/swiftformat.nix index 8d4344f..dc5fb06 100644 --- a/pkgs/swiftformat.nix +++ b/pkgs/swiftformat.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, swift, swiftpm, swiftPackages }: +{ clangStdenv, lib, fetchFromGitHub, swift, swiftpm, swiftPackages }: -stdenv.mkDerivation rec { +clangStdenv.mkDerivation rec { pname = "swiftformat"; version = "0.52.4";