nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 04:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #98239 from Sohalt/avy

Browse Source 
avy: 2017.10.16 -> cav19
This commit is contained in:
Austin Seipp 2020-09-22 23:19:05 -05:00 committed by GitHub
commit daaa0e3350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch
View File

@ -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})

12
pkgs/applications/science/logic/avy/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchgit, cmake, zlib, boost }: { stdenv, fetchgit, cmake, zlib, boost }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "avy"; pname = "avy";
version = "2017.10.16"; version = "2019.05.01"; # date of cav19 tag
src = fetchgit { src = fetchgit {
url = "https://bitbucket.org/arieg/extavy"; url = "https://bitbucket.org/arieg/extavy";
rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3"; rev = "cav19";
sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh"; sha256 = "0qdzy9srxp5f38x4dbb3prnr9il6cy0kz80avrvd7fxqzy7wdlwy";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -31,10 +31,6 @@ stdenv.mkDerivation {
patch -p1 -d glucose -i ${./glucose-fenv.patch} patch -p1 -d glucose -i ${./glucose-fenv.patch}
''; '';
patches =
[ ./0001-no-static-boost-libs.patch
];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp avy/src/{avy,avybmc} $out/bin/ cp avy/src/{avy,avybmc} $out/bin/