mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
avy: 2017.10.16 -> 2019.05.01
This commit is contained in:
parent
5096b51667
commit
40722346b8
@ -1,12 +0,0 @@
|
||||
diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt
|
||||
index 5913076..b0453b5 100644
|
||||
--- a/avy/CMakeLists.txt
|
||||
+++ b/avy/CMakeLists.txt
|
||||
@@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT)
|
||||
set (Boost_NO_SYSTEM_PATHS "ON")
|
||||
endif()
|
||||
|
||||
-set (Boost_USE_STATIC_LIBS ON)
|
||||
find_package (Boost 1.46.1 REQUIRED program_options)
|
||||
IF (Boost_FOUND)
|
||||
include_directories (${Boost_INCLUDE_DIRS})
|
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchgit, cmake, zlib, boost }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avy";
|
||||
version = "2017.10.16";
|
||||
version = "2019.05.01"; # date of cav19 tag
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://bitbucket.org/arieg/extavy";
|
||||
rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3";
|
||||
sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh";
|
||||
rev = "cav19";
|
||||
sha256 = "0qdzy9srxp5f38x4dbb3prnr9il6cy0kz80avrvd7fxqzy7wdlwy";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -31,10 +31,6 @@ stdenv.mkDerivation {
|
||||
patch -p1 -d glucose -i ${./glucose-fenv.patch}
|
||||
'';
|
||||
|
||||
patches =
|
||||
[ ./0001-no-static-boost-libs.patch
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp avy/src/{avy,avybmc} $out/bin/
|
||||
|
Loading…
Reference in New Issue
Block a user