mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
minisat: Fix build on Darwin
This commit is contained in:
parent
e54650e92a
commit
c5b96ca801
26
pkgs/applications/science/logic/minisat/darwin.patch
Normal file
26
pkgs/applications/science/logic/minisat/darwin.patch
Normal file
@ -0,0 +1,26 @@
|
||||
https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb
|
||||
|
||||
diff --git a/utils/System.cc b/utils/System.cc
|
||||
index a7cf53f..feeaf3c 100644
|
||||
--- a/utils/System.cc
|
||||
+++ b/utils/System.cc
|
||||
@@ -78,16 +78,17 @@ double Minisat::memUsed(void) {
|
||||
struct rusage ru;
|
||||
getrusage(RUSAGE_SELF, &ru);
|
||||
return (double)ru.ru_maxrss / 1024; }
|
||||
-double MiniSat::memUsedPeak(void) { return memUsed(); }
|
||||
+double Minisat::memUsedPeak(void) { return memUsed(); }
|
||||
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
#include <malloc/malloc.h>
|
||||
|
||||
-double Minisat::memUsed(void) {
|
||||
+double Minisat::memUsed() {
|
||||
malloc_statistics_t t;
|
||||
malloc_zone_statistics(NULL, &t);
|
||||
return (double)t.max_size_in_use / (1024*1024); }
|
||||
+double Minisat::memUsedPeak() { return memUsed(); }
|
||||
|
||||
#else
|
||||
double Minisat::memUsed() {
|
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ];
|
||||
patches =
|
||||
[ ./darwin.patch ]
|
||||
++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user