diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 6bc5d874bc0..fe13a9aebbc 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }: +{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { - url = "mirror://sourceforge/qalculate/${name}.tar.gz"; - sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4"; + url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; + sha256 = "15ci0p7jlikk2rira6ykgrmcdvgpxzprpqmkdxx6hsg4pvzrj54s"; }; - nativeBuildInputs = [ intltool pkgconfig ]; - buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ]; + buildInputs = [ libqalculate gtk3 ]; meta = with stdenv.lib; { description = "The ultimate desktop calculator"; - homepage = http://qalculate.sourceforge.net; + homepage = http://qalculate.github.io; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 3d9a288b5bb..8c6ee6dc9b9 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig }: +{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig, doxygen, autoreconfHook, readline }: stdenv.mkDerivation rec { - name = "libqalculate-0.9.7"; + name = "libqalculate-${version}"; + version = "0.9.8"; src = fetchurl { - url = "mirror://sourceforge/qalculate/${name}.tar.gz"; - sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs"; + url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; + sha256 = "07rd95a0wsqs3iymr64mlljn191f8gdnjvr9d4l1spjv3s8j5wdi"; }; - outputs = [ "out" "doc" ]; - - buildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; + buildInputs = [ readline ]; propagatedBuildInputs = [ cln libxml2 glib ]; - meta = { + preBuild = '' + pushd docs/reference + doxygen Doxyfile + popd + ''; + + meta = with stdenv.lib; { description = "An advanced calculator library"; - homepage = http://qalculate.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + homepage = http://qalculate.github.io; + maintainers = with maintainers; [ urkud gebner ]; + platforms = platforms.all; }; }