diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-03-19 18:22:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 18:22:59 +0100 |
| commit | 575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a (patch) | |
| tree | cedf266eda8ed3c7a09564d2f4441cb91f1ffe23 /pkgs | |
| parent | b82f3f694388f23986a84240ea949c883155687f (diff) | |
| parent | 7b1e1f3cd79e46ae83819a0d1324524be17c89d9 (diff) | |
| download | nixpkgs-575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a.tar nixpkgs-575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a.tar.gz nixpkgs-575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a.tar.bz2 nixpkgs-575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a.tar.lz nixpkgs-575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a.tar.xz nixpkgs-575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a.tar.zst nixpkgs-575cf2e17fdcf5f146fe0a6cbccc2f772da7ee7a.zip | |
Merge pull request #24035 from ndowens/leocad
leocad: 0.81 -> 17.02
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/leocad/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 96384765bd0..0de170a1cac 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -3,24 +3,26 @@ To use aditional parts libraries set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ */ -{ stdenv, fetchsvn, qt4, qmake4Hook, zlib }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "0.81"; + version = "17.02"; - src = fetchsvn { - url = "http://svn.leocad.org/tags/${name}"; - sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8"; + src = fetchFromGitHub { + owner = "leozide"; + repo = "leocad"; + rev = "v${version}"; + sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; }; - buildInputs = [ qt4 qmake4Hook zlib ]; - + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 zlib ]; postPatch = '' sed '1i#include <cmath>' -i common/camera.cpp substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan(" export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" - ''; + ''; meta = with stdenv.lib; { description = "CAD program for creating virtual LEGO models"; |