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: 2455b2e3091d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 761df21d6f67
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 3, 2019

  1. libcxxabi: don't depend on libunwind

    @nmattia
    nmattia committed Oct 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    tadeokondrak Tadeo Kondrak
    GPG key ID: D41E092CA43F1D8B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    76b54c7 View commit details

Commits on Oct 4, 2019

  1. Merge pull request #70321 from nmattia/nm-no-unwind-for-cxxabi 

    libcxxabi: don't depend on libunwind
    @basvandijk
    basvandijk authored Oct 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    tadeokondrak Tadeo Kondrak
    GPG key ID: D41E092CA43F1D8B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    761df21 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/development/compilers/llvm/7/libc++abi.nix
3 changes: 1 addition & 2 deletions pkgs/development/compilers/llvm/7/libc++abi.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
{ stdenv, cmake, fetch, libcxx, llvm, version }:

stdenv.mkDerivation {
pname = "libc++abi";
@@ -7,7 +7,6 @@ stdenv.mkDerivation {
src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";

nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

postUnpack = ''
unpackFile ${libcxx.src}