diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/misc/gplates/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/science/misc/gplates/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/science/misc/gplates/default.nix b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix index e6cebbc53b73..4ab17c22934e 100644 --- a/nixpkgs/pkgs/applications/science/misc/gplates/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/gplates/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, mkDerivation -, fetchurl +, fetchFromGitHub , cmake , doxygen , graphviz @@ -12,11 +11,13 @@ , gmp , libGL , libGLU +, libSM , mpfr , proj , python3 , qtxmlpatterns , qwt +, wrapQtAppsHook }: let @@ -30,24 +31,22 @@ let cgal = cgal_5.override { boost = boost'; }; -in mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "gplates"; - version = "2.3.0"; + version = "2.4"; - src = fetchurl { - name = "gplates_${version}_src.tar.bz2"; - url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428"; - sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96"; + src = fetchFromGitHub { + owner = "GPlates"; + repo = "GPlates"; + rev = "GPlates-${finalAttrs.version}"; + hash = "sha256-BRvrqczGguE2z44ZboxeJxgWEA+t02XkzvU+yF4ki6s="; }; - patches = [ - ./boost-placeholders.patch - ]; - nativeBuildInputs = [ cmake doxygen graphviz + wrapQtAppsHook ]; buildInputs = [ @@ -58,6 +57,7 @@ in mkDerivation rec { gmp libGL libGLU + libSM mpfr proj python @@ -70,6 +70,6 @@ in mkDerivation rec { homepage = "https://www.gplates.org"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gplates.x86_64-darwin + broken = stdenv.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 }; -} +}) |