diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-12 19:51:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-12 19:51:01 +0100 |
| commit | 2dba30af721d452000917a55a21a722331b113df (patch) | |
| tree | 5a59f76c16389f9561c6e3334d84538fb6aa3ea3 /pkgs/development/compilers | |
| parent | a8d7a6a9577d70a80f55f1ddd766ee94617fad61 (diff) | |
| parent | 2ce45fbf0d491209758faf57522568e91ff88874 (diff) | |
| download | nixpkgs-2dba30af721d452000917a55a21a722331b113df.tar nixpkgs-2dba30af721d452000917a55a21a722331b113df.tar.gz nixpkgs-2dba30af721d452000917a55a21a722331b113df.tar.bz2 nixpkgs-2dba30af721d452000917a55a21a722331b113df.tar.lz nixpkgs-2dba30af721d452000917a55a21a722331b113df.tar.xz nixpkgs-2dba30af721d452000917a55a21a722331b113df.tar.zst nixpkgs-2dba30af721d452000917a55a21a722331b113df.zip | |
Merge recent staging
It's almost finished by Hydra now.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/llvm.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index e1edbf5d0e7..62f1514e231 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -45,6 +46,13 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; postPatch = "" + + '' + patch -p1 --reverse < ${fetchpatch { + name = "fix-red-icons.diff"; # https://bugs.freedesktop.org/show_bug.cgi?id=99078 + url = https://github.com/llvm-mirror/llvm/commit/c280d74837d8.diff; + sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf"; + }} + '' # hacky fix: New LLVM releases require a newer OS X SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. |