diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-26 14:07:56 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-26 15:26:55 -0500 |
| commit | f5fc1ff34499756914b0b4d6b444d3640153adcd (patch) | |
| tree | 03831a37cd3e0c15624bfd9cff3beac88ab83722 | |
| parent | 4a2340ff6bd0474d9a3e933f28b8568c59019b82 (diff) | |
| download | nixlib-f5fc1ff34499756914b0b4d6b444d3640153adcd.tar nixlib-f5fc1ff34499756914b0b4d6b444d3640153adcd.tar.gz nixlib-f5fc1ff34499756914b0b4d6b444d3640153adcd.tar.bz2 nixlib-f5fc1ff34499756914b0b4d6b444d3640153adcd.tar.lz nixlib-f5fc1ff34499756914b0b4d6b444d3640153adcd.tar.xz nixlib-f5fc1ff34499756914b0b4d6b444d3640153adcd.tar.zst nixlib-f5fc1ff34499756914b0b4d6b444d3640153adcd.zip | |
top level: Stop hacking around #28223
Clang stdenvs with either libc++ should work now.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cea7a7478add..15be2dcacbf7 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; }); |