monosat: 60528a3 -> 1.8.0

This fixes the broken Linux build by only building the dynamic library/
executable (an option that was only added in the latest tagged version).
wip/yesman
Aiken Cairncross 5 years ago committed by worldofpeace
parent b4da391ade
commit 15dbd8de7c
  1. 19
      pkgs/applications/science/logic/monosat/default.nix

@ -8,11 +8,11 @@ with stdenv.lib;
let
boolToCmake = x: if x then "ON" else "OFF";
rev = "2deeadeff214e975c9f7508bc8a24fa05a1a0c32";
sha256 = "09yhym2lxmn3xbhw5fcxawnmvms5jd9fw9m7x2wzil7yvy4vwdjn";
rev = "1.8.0";
sha256 = "0q3a8x3iih25xkp2bm842sm2hxlb8hxlls4qmvj7vzwrh4lvsl7b";
pname = "monosat";
version = substring 0 7 sha256;
version = rev;
src = fetchFromGitHub {
owner = "sambayless";
@ -25,7 +25,11 @@ let
inherit src;
buildInputs = [ cmake zlib gmp jdk8 ];
cmakeFlags = [ "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" ];
cmakeFlags = [
"-DBUILD_STATIC=OFF"
"-DJAVA=${boolToCmake includeJava}"
"-DGPL=${boolToCmake includeGplCode}"
];
postInstall = optionalString includeJava ''
mkdir -p $out/share/java
@ -51,18 +55,15 @@ let
propagatedBuildInputs = [ core cython ];
# This tells setup.py to use cython
# This tells setup.py to use cython, which should produce faster bindings
MONOSAT_CYTHON = true;
# The relative paths here don't make sense for our Nix build
# Also, let's use cython since it should produce faster bindings
# TODO: do we want to just reference the core monosat library rather than copying the
# shared lib? The current setup.py copies the .dylib/.so...
postPatch = ''
substituteInPlace setup.py \
--replace '../../../../libmonosat.dylib' '${core}/lib/libmonosat.dylib' \
--replace '../../../../libmonosat.so' '${core}/lib/libmonosat.so'
--replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"'
'';
};
in core

Loading…
Cancel
Save