xaos: 3.6 -> 4.2.1

+38 -22
+37 -19
pkgs/applications/graphics/xaos/default.nix
··· 1 - { lib, stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext 2 - , libXt, zlib, gettext, intltool, perl }: 1 + { lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, wrapQtAppsHook, copyDesktopItems }: 3 2 4 - stdenv.mkDerivation rec { 3 + let datapath = "$out/share/XaoS"; 4 + in stdenv.mkDerivation rec { 5 5 pname = "xaos"; 6 - version = "3.6"; 6 + version = "4.2.1"; 7 + outputs = [ "out" "man" ]; 7 8 8 - src = fetchurl { 9 - url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz"; 10 - sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; 9 + src = fetchFromGitHub { 10 + owner = "xaos-project"; 11 + repo = pname; 12 + rev = "release-${version}"; 13 + hash = "sha256-JLF8Mz/OHZEEJG/aryKQuJ6B5R8hPJdvln7mbKoqXFU="; 11 14 }; 12 15 13 - hardeningDisable = [ "format" ]; 16 + nativeBuildInputs = [ qmake qttools wrapQtAppsHook copyDesktopItems ]; 17 + buildInputs = [ qtbase ]; 14 18 15 - nativeBuildInputs = [ intltool ]; 16 - buildInputs = [ 17 - aalib gsl libpng libX11 xorgproto libXext 18 - libXt zlib gettext perl 19 - ]; 19 + QMAKE_LRELEASE = "lrelease"; 20 + DEFINES = [ "USE_OPENGL" "USE_FLOAT128" ]; 20 21 21 - preConfigure = '' 22 - sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') 23 - mkdir -p $out/share/locale 22 + postPatch = '' 23 + substituteInPlace src/include/config.h \ 24 + --replace "/usr/share/XaoS" "${datapath}" 24 25 ''; 25 26 26 - meta = { 27 - homepage = "http://xaos.sourceforge.net/"; 28 - description = "Fractal viewer"; 27 + desktopItems = [ "xdg/xaos.desktop" ]; 28 + 29 + installPhase = '' 30 + runHook preInstall 31 + 32 + install -D bin/xaos "$out/bin/xaos" 33 + 34 + mkdir -p "${datapath}" 35 + cp -r tutorial examples catalogs "${datapath}" 36 + 37 + install -D "xdg/${pname}.png" "$out/share/icons/${pname}.png" 38 + 39 + install -D doc/xaos.6 "$man/man6/xaos.6" 40 + runHook postInstall 41 + ''; 42 + 43 + meta = src.meta // { 44 + description = "Real-time interactive fractal zoomer"; 45 + homepage = "https://xaos-project.github.io/"; 29 46 license = lib.licenses.gpl2Plus; 30 47 platforms = [ "x86_64-linux" ]; 48 + maintainers = with lib.maintainers; [ ehmry ]; 31 49 }; 32 50 }
+1 -3
pkgs/top-level/all-packages.nix
··· 33754 33754 33755 33755 xannotate = callPackage ../tools/X11/xannotate {}; 33756 33756 33757 - xaos = callPackage ../applications/graphics/xaos { 33758 - libpng = libpng12; 33759 - }; 33757 + xaos = libsForQt5.callPackage ../applications/graphics/xaos { }; 33760 33758 33761 33759 xastir = callPackage ../applications/misc/xastir { 33762 33760 rastermagick = imagemagick6;