summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/graphics/antimony
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/graphics/antimony')
-rw-r--r--pkgs/applications/graphics/antimony/default.nix26
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 334a5a33dadf..aa6305ce8311 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -1,29 +1,34 @@
-{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }:
+{ stdenv, fetchFromGitHub, libpng, python3
+, libGLU_combined, qtbase, ncurses
+, cmake, flex, lemon
+}:
let
- gitRev = "020910c25614a3752383511ede5a1f5551a8bd39";
- gitBranch = "master";
+ gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059";
+ gitBranch = "develop";
gitTag = "0.9.3";
in
stdenv.mkDerivation rec {
name = "antimony-${version}";
- version = gitTag;
+ version = "2018-07-17";
src = fetchFromGitHub {
- owner = "mkeeter";
- repo = "antimony";
- rev = gitTag;
- sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4";
+ owner = "mkeeter";
+ repo = "antimony";
+ rev = gitRev;
+ sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl";
};
patches = [ ./paths-fix.patch ];
postPatch = ''
- sed -i "s,/usr/local,$out,g" app/CMakeLists.txt app/app/app.cpp app/app/main.cpp
+ sed -i "s,/usr/local,$out,g" \
+ app/CMakeLists.txt app/app/app.cpp app/app/main.cpp
+ sed -i "s,python-py35,python36," CMakeLists.txt
'';
buildInputs = [
- libpng python3 (boost.override { python = python3; })
+ libpng python3 python3.pkgs.boost
libGLU_combined qtbase ncurses
];
@@ -41,6 +46,7 @@ in
description = "A computer-aided design (CAD) tool from a parallel universe";
homepage = "https://github.com/mkeeter/antimony";
license = licenses.mit;
+ maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.linux;
};
}