public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monosat: cbaf79cf -> 2deeadef

Browse Source 
Upstream fixed a few things I needed to work around
This commit is contained in:
Dan Peebles 2018-07-08 21:56:56 -04:00
parent 461ab720e5
commit 0372c87481
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/science/logic/monosat/default.nix
View File

@ -8,8 +8,8 @@ with stdenv.lib;
let let
boolToCmake = x: if x then "ON" else "OFF"; boolToCmake = x: if x then "ON" else "OFF";
rev = "cbaf79cfd01cba97b46cae5a9d7b832771ff442c"; rev = "2deeadeff214e975c9f7508bc8a24fa05a1a0c32";
sha256 = "1nx3wh34y53lrwgh94cskdrdyrj26jn3py7z2cn4bvacz0wzhi6n"; sha256 = "09yhym2lxmn3xbhw5fcxawnmvms5jd9fw9m7x2wzil7yvy4vwdjn";
pname = "monosat"; pname = "monosat";
version = substring 0 7 sha256; version = substring 0 7 sha256;
@ -27,12 +27,6 @@ let
cmakeFlags = [ "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" ]; cmakeFlags = [ "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" ];
# Minor logic bug: https://github.com/sambayless/monosat/issues/11#issuecomment-403297720
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace '"&&" "true"' '"||" "true"'
'';
postInstall = optionalString includeJava '' postInstall = optionalString includeJava ''
mkdir -p $out/share/java mkdir -p $out/share/java
cp monosat.jar $out/share/java cp monosat.jar $out/share/java
@ -65,9 +59,6 @@ let
--replace '../../../../libmonosat.dylib' '${core}/lib/libmonosat.dylib' \ --replace '../../../../libmonosat.dylib' '${core}/lib/libmonosat.dylib' \
--replace '../../../../libmonosat.so' '${core}/lib/libmonosat.so' \ --replace '../../../../libmonosat.so' '${core}/lib/libmonosat.so' \
--replace 'use_cython=False' 'use_cython=True' --replace 'use_cython=False' 'use_cython=True'
# This seems to be forgotten and unused. See https://github.com/sambayless/monosat/issues/10
rm monosat/cnf.py
''; '';
}; };
in core in core