diff options
| author | sohalt <sohalt@sohalt.net> | 2020-09-19 01:16:22 +0200 |
|---|---|---|
| committer | sohalt <sohalt@sohalt.net> | 2020-09-20 16:13:29 +0200 |
| commit | 40722346b81d28e9040a38ba44df6e49dbc80d3e (patch) | |
| tree | b51e8868c75c537dc8bc31e73787f6cbddc8cc8d /pkgs/applications/science/logic | |
| parent | 5096b51667dfa837d7253a3a5b7ac2b8ce8551a3 (diff) | |
avy: 2017.10.16 -> 2019.05.01
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/avy/default.nix | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch deleted file mode 100644 index a53142faba66..000000000000 --- a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch +++ /dev/null @@ -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}) diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 78ed641a809a..6b48c1e34488 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -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/ |