livcxx build
This commit is contained in:
parent
7da056233f
commit
2e26f7bef1
|
@ -26,6 +26,6 @@ in stdenv.mkDerivation rec {
|
||||||
description = "A new implementation of the C++ standard library, targeting C++11";
|
description = "A new implementation of the C++ standard library, targeting C++11";
|
||||||
license = "BSD";
|
license = "BSD";
|
||||||
maintainers = stdenv.lib.maintainers.shlevy;
|
maintainers = stdenv.lib.maintainers.shlevy;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,6 @@ in stdenv.mkDerivation {
|
||||||
description = "A new implementation of low level support for a standard C++ library";
|
description = "A new implementation of low level support for a standard C++ library";
|
||||||
license = "BSD";
|
license = "BSD";
|
||||||
maintainers = stdenv.lib.maintainers.shlevy;
|
maintainers = stdenv.lib.maintainers.shlevy;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,10 +10,6 @@ stdenv.mkDerivation (rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [ncurses];
|
propagatedBuildInputs = [ncurses];
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
export CC=clang
|
|
||||||
'';
|
|
||||||
|
|
||||||
patchFlags = "-p0";
|
patchFlags = "-p0";
|
||||||
patches =
|
patches =
|
||||||
[ ./link-against-ncurses.patch
|
[ ./link-against-ncurses.patch
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, pkgs, config }:
|
{ stdenv, pkgs, config, haveLibCxx }:
|
||||||
|
|
||||||
import ../generic rec {
|
import ../generic rec {
|
||||||
inherit config;
|
inherit config;
|
||||||
|
@ -27,11 +27,11 @@ import ../generic rec {
|
||||||
nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
|
nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
|
||||||
nativeLibc = true;
|
nativeLibc = true;
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
libcxx = pkgs.libcxx.override {
|
libcxx = if haveLibCxx then pkgs.libcxx.override {
|
||||||
libcxxabi = pkgs.libcxxabi.override {
|
libcxxabi = pkgs.libcxxabi.override {
|
||||||
libunwind = pkgs.libunwindNative;
|
libunwind = pkgs.libunwindNative;
|
||||||
};
|
};
|
||||||
};
|
} else null;
|
||||||
binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;};
|
binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;};
|
||||||
clang = pkgs.clang_34;
|
clang = pkgs.clang_34;
|
||||||
coreutils = pkgs.coreutils;
|
coreutils = pkgs.coreutils;
|
||||||
|
|
|
@ -37,6 +37,14 @@ rec {
|
||||||
inherit config;
|
inherit config;
|
||||||
stdenv = stdenvNative;
|
stdenv = stdenvNative;
|
||||||
pkgs = stdenvNativePkgs;
|
pkgs = stdenvNativePkgs;
|
||||||
|
haveLibCxx = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
stdenvDarwinNaked = import ./darwin {
|
||||||
|
inherit config;
|
||||||
|
stdenv = stdenvNative;
|
||||||
|
pkgs = stdenvNativePkgs;
|
||||||
|
haveLibCxx = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1800,7 +1800,11 @@ let
|
||||||
|
|
||||||
openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; });
|
openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; });
|
||||||
|
|
||||||
opensp = callPackage ../tools/text/sgml/opensp { };
|
opensp = callPackage ../tools/text/sgml/opensp {
|
||||||
|
stdenv = if stdenv.isDarwin
|
||||||
|
then allStdenvs.stdenvDarwinNaked
|
||||||
|
else stdenv;
|
||||||
|
};
|
||||||
|
|
||||||
spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { };
|
spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue