lol

xaos: reimplement using mkDerivation

+16 -21
+14 -20
pkgs/applications/graphics/xaos/default.nix
··· 1 - a @ { libXt, libX11, libXext, xextproto, xproto, gsl, aalib, zlib, intltool, gettext, perl, ... }: 2 - let 3 - fetchurl = a.fetchurl; 1 + { stdenv, fetchurl, aalib, gsl, libpng, libX11, xproto, libXext 2 + , xextproto, libXt, zlib, gettext, intltool, perl }: 3 + 4 + stdenv.mkDerivation rec { 5 + name = "xaos-${version}"; 6 + version = "3.6"; 4 7 5 - version = a.lib.attrByPath ["version"] "3.6" a; 6 - buildInputs = with a; [ 7 - aalib gsl libpng libX11 xproto libXext xextproto 8 - libXt zlib gettext intltool perl 9 - ]; 10 - in 11 - rec { 12 8 src = fetchurl { 13 - url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz"; 9 + url = "mirror://sourceforge/xaos/${name}.tar.gz"; 14 10 sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; 15 11 }; 16 12 17 - inherit buildInputs; 18 - configureFlags = []; 13 + buildInputs = [ 14 + aalib gsl libpng libX11 xproto libXext xextproto 15 + libXt zlib gettext intltool perl 16 + ]; 19 17 20 - /* doConfigure should be removed if not needed */ 21 - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; 22 - 23 - preConfigure = a.fullDepEntry ('' 18 + preConfigure = '' 24 19 sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') 25 20 mkdir -p $out/share/locale 26 - '') ["doUnpack" "minInit" "defEnsureDir"]; 21 + ''; 27 22 28 - name = "xaos-" + version; 29 23 meta = { 30 24 homepage = http://xaos.sourceforge.net/; 31 25 description = "Fractal viewer"; 32 - license = a.stdenv.lib.licenses.gpl2Plus; 26 + license = stdenv.lib.licenses.gpl2Plus; 33 27 }; 34 28 }
+2 -1
pkgs/top-level/all-packages.nix
··· 13564 13564 13565 13565 x42-plugins = callPackage ../applications/audio/x42-plugins { }; 13566 13566 13567 - xaos = builderDefsPackage (callPackage ../applications/graphics/xaos) { 13567 + xaos = callPackage ../applications/graphics/xaos { 13568 + inherit (xlibs) libXt libX11 libXext xextproto xproto; 13568 13569 libpng = libpng12; 13569 13570 }; 13570 13571