summary refs log tree commit diff
path: root/pkgs/applications/graphics/antimony
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-03-10 18:58:28 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-03-10 18:58:28 +0100
commit7ccccec51b993a30e7e9b0648a5a84183ab4dc53 (patch)
tree88c35d87b2d5d2faf5943041b789d1d7fb372384 /pkgs/applications/graphics/antimony
parentfa5210272374933e660ebccd61c91816a1a7a41c (diff)
downloadnixpkgs-7ccccec51b993a30e7e9b0648a5a84183ab4dc53.tar
nixpkgs-7ccccec51b993a30e7e9b0648a5a84183ab4dc53.tar.gz
nixpkgs-7ccccec51b993a30e7e9b0648a5a84183ab4dc53.tar.bz2
nixpkgs-7ccccec51b993a30e7e9b0648a5a84183ab4dc53.tar.lz
nixpkgs-7ccccec51b993a30e7e9b0648a5a84183ab4dc53.tar.xz
nixpkgs-7ccccec51b993a30e7e9b0648a5a84183ab4dc53.tar.zst
nixpkgs-7ccccec51b993a30e7e9b0648a5a84183ab4dc53.zip
antimony: fix build with glibc-2.23
And enableParalelBuilding = true;
Diffstat (limited to 'pkgs/applications/graphics/antimony')
-rw-r--r--pkgs/applications/graphics/antimony/default.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 5e8dfd93f30..dded423652c 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -16,6 +16,15 @@ in
     };
 
     patches = [ ./paths-fix.patch ];
+    # fix build with glibc-2.23
+    postPatch = ''
+      sed 's/\<isinf(/std::isinf(/g' -i \
+        src/export/export_heightmap.cpp \
+        src/fab/types/bounds.cpp \
+        src/graph/hooks/meta.cpp \
+        src/ui/dialogs/resolution_dialog.cpp \
+        src/render/render_task.cpp
+    '';
 
     buildInputs = [
       libpng python3 (boost.override { python = python3; })
@@ -32,6 +41,8 @@ in
       qmake antimony.pro PREFIX=$out
     '';
 
+    enableParallelBuilding = true;
+
     meta = with stdenv.lib; {
       description = "A computer-aided design (CAD) tool from a parallel universe";
       homepage    = "https://github.com/mkeeter/antimony";