alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

top level: Stop hacking around #28223

Browse source 
Clang stdenvs with either libc++ should work now.
This commit is contained in:
John Ericson 2017-12-26 14:07:56 -05:00
parent 4a2340ff6b
commit f5fc1ff344
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View file

@ -1556,7 +1556,6 @@ with pkgs;
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec {
clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
python = python2; python = python2;
inherit (python2Packages) gyp; inherit (python2Packages) gyp;
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
@ -2043,7 +2042,6 @@ with pkgs;
m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };
mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec {
clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
python = python2; python = python2;
inherit (python2Packages) gyp; inherit (python2Packages) gyp;
protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });