diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 7e01d3847d56..44c8313d9c3a 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,34 +1,28 @@ -a @ { libXt, libX11, libXext, xextproto, xproto, gsl, aalib, zlib, intltool, gettext, perl, ... }: -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xproto, libXext +, xextproto, libXt, zlib, gettext, intltool, perl }: + +stdenv.mkDerivation rec { + name = "xaos-${version}"; + version = "3.6"; - version = a.lib.attrByPath ["version"] "3.6" a; - buildInputs = with a; [ - aalib gsl libpng libX11 xproto libXext xextproto - libXt zlib gettext intltool perl - ]; -in -rec { src = fetchurl { - url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz"; + url = "mirror://sourceforge/xaos/${name}.tar.gz"; sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ + aalib gsl libpng libX11 xproto libXext xextproto + libXt zlib gettext intltool perl + ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - - preConfigure = a.fullDepEntry ('' + preConfigure = '' sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') mkdir -p $out/share/locale - '') ["doUnpack" "minInit" "defEnsureDir"]; + ''; - name = "xaos-" + version; meta = { homepage = http://xaos.sourceforge.net/; description = "Fractal viewer"; - license = a.stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 139959427977..20afb6d585d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13564,7 +13564,8 @@ let x42-plugins = callPackage ../applications/audio/x42-plugins { }; - xaos = builderDefsPackage (callPackage ../applications/graphics/xaos) { + xaos = callPackage ../applications/graphics/xaos { + inherit (xlibs) libXt libX11 libXext xextproto xproto; libpng = libpng12; };