From f5fc1ff34499756914b0b4d6b444d3640153adcd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 26 Dec 2017 14:07:56 -0500 Subject: [PATCH] top level: Stop hacking around #28223 Clang stdenvs with either libc++ should work now. --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cea7a7478ad..15be2dcacbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1556,7 +1556,6 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { - clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -2043,7 +2042,6 @@ with pkgs; m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { - clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });