Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e48e080d6d95
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2d90138b3b90
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 18, 2018

  1. clang3.4: still needs libedit 

    https://hydra.nixos.org/build/72965931/nixlog/1
    @matthewbauer
    matthewbauer authored Apr 18, 2018
    Copy the full SHA
    2d90138 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/compilers/llvm/3.4/clang.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/3.4/clang.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }:
{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:

stdenv.mkDerivation {
name = "clang-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {

patches = [ ./clang-separate-build.patch ./clang-purity.patch ];

buildInputs = [ cmake libxml2 zlib ];
buildInputs = [ cmake libedit libxml2 zlib ];

cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"