BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dale: 20170519 -> 20181024

Browse source
This commit is contained in:
Luka Blaskovic 2020-01-18 10:26:55 +00:00 committed by worldofpeace
parent 6ea79d2707
commit 1ebc042878
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/dale/default.nix
View file

@ -3,12 +3,12 @@
, cmake , cmake
, pkgconfig , pkgconfig
, libffi , libffi
, llvm_35 , llvm_6
, doCheck ? false , doCheck ? false
, perl , perl
}: }:
let version = "20170519"; let version = "20181024";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "dale"; pname = "dale";
@ -17,16 +17,14 @@ in stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tomhrr"; owner = "tomhrr";
repo = "dale"; repo = "dale";
rev = "39e16d8e89fa070de65a673d4462e783d530f95a"; rev = "f5db8b486f4e7c423fc25941a8315f1209bc0e54";
sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl"; sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake libffi llvm_35 ] buildInputs = [ cmake libffi llvm_6 ]
++ stdenv.lib.optional doCheck perl; ++ stdenv.lib.optional doCheck perl;
patches = [ ./link-llvm.patch ];
inherit doCheck; inherit doCheck;
checkTarget = "tests"; checkTarget = "tests";

10
pkgs/development/compilers/dale/link-llvm.patch
View file

@ -1,10 +0,0 @@
--- dale-39e16d8e89fa070de65a673d4462e783d530f95a-src.org/CMakeLists.txt 2017-06-22 08:01:05.839531242 +0100
+++ dale-39e16d8e89fa070de65a673d4462e783d530f95a-src/CMakeLists.txt 2017-06-22 07:59:11.777566801 +0100
@@ -78,6 +78,7 @@
execute_process (COMMAND ${LLVM_CONFIG} --libs
OUTPUT_VARIABLE LLVM_LIBS
OUTPUT_STRIP_TRAILING_WHITESPACE)
+STRING(REGEX REPLACE " " ";" LLVM_LIBS "${LLVM_LIBS}")
if (${D_LLVM_VERSION_MINOR} GREATER 4)
execute_process (COMMAND ${LLVM_CONFIG} --system-libs
OUTPUT_VARIABLE LLVM_SYSTEM_LIBS