public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61354 from ThomasMader/dlang-update

Browse Source 
Fix ldc
This commit is contained in:
Renaud 2019-05-12 17:33:11 +02:00 committed by GitHub
commit b6e415a33f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/dmd/default.nix
View File

@ -103,8 +103,7 @@ stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
cd dmd cd dmd
# https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846 make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
#make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL
cd ../druntime cd ../druntime
make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release
cd ../phobos cd ../phobos

8
pkgs/development/compilers/ldc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, ninja, llvm, llvm_8, curl, tzdata { stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
, python, libconfig, lit, gdb, unzip, darwin, bash , python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, targetPackages , callPackage, makeWrapper, targetPackages
, bootstrapVersion ? false , bootstrapVersion ? false
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [ ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [
# https://github.com/NixOS/nixpkgs/issues/57120 # https://github.com/NixOS/nixpkgs/issues/57120
# https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515
llvm llvm_5
] ]
++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
] ]
++ stdenv.lib.optional (bootstrapVersion) [ ++ stdenv.lib.optional (bootstrapVersion) [
libconfig llvm libconfig llvm_5
] ]
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
else else
""; "";
doCheck = !bootstrapVersion && !stdenv.isDarwin; doCheck = !bootstrapVersion;
checkPhase = stdenv.lib.optionalString doCheck '' checkPhase = stdenv.lib.optionalString doCheck ''
# Build default lib test runners # Build default lib test runners