diff options
| author | arthsmn <arth.sh@proton.me> | 2024-01-01 20:34:44 -0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-04 14:19:31 +0100 |
| commit | 4ee1815267b03575de4b117d493fe3f04aaeeb33 (patch) | |
| tree | 879a0d8f8fe2035730aadad76519ae3cb5758ebd /pkgs/applications/science/misc/gplates | |
| parent | 61276c8099fbfc6d6ab72b9b2794cf22e9c9db45 (diff) | |
gplates: 2.3.0 -> 2.4
Diffstat (limited to 'pkgs/applications/science/misc/gplates')
| -rw-r--r-- | pkgs/applications/science/misc/gplates/default.nix | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 283a14e996502..4ab17c22934e1 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, mkDerivation -, fetchurl +, fetchFromGitHub , cmake , doxygen , graphviz @@ -18,6 +17,7 @@ , python3 , qtxmlpatterns , qwt +, wrapQtAppsHook }: let @@ -31,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 = [ @@ -72,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 }; -} +}) |