Merge master into staging-next
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ace";
|
||||
version = "6.5.5";
|
||||
version = "6.5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
|
||||
sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39";
|
||||
sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patchPhase = ''substituteInPlace ./MPC/prj_install.pl \
|
||||
--replace /usr/bin/perl "${perl}/bin/perl"'';
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
export INSTALL_PREFIX=$out
|
||||
export ACE_ROOT=$(pwd)
|
||||
|
||||
Reference in New Issue
Block a user