public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xaos: reimplement using mkDerivation

This commit is contained in:
Joachim Fasting 2015-06-17 00:50:55 +02:00
parent 8aa63b34da
commit ddb9c3b701
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/graphics/xaos/default.nix
View File

@ -1,34 +1,28 @@
a @ { libXt, libX11, libXext, xextproto, xproto, gsl, aalib, zlib, intltool, gettext, perl, ... }: { stdenv, fetchurl, aalib, gsl, libpng, libX11, xproto, libXext
let , xextproto, libXt, zlib, gettext, intltool, perl }:
fetchurl = a.fetchurl;
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 { src = fetchurl {
url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz"; url = "mirror://sourceforge/xaos/${name}.tar.gz";
sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
}; };
inherit buildInputs; buildInputs = [
configureFlags = []; aalib gsl libpng libX11 xproto libXext xextproto
libXt zlib gettext intltool perl
];
/* doConfigure should be removed if not needed */ preConfigure = ''
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = a.fullDepEntry (''
sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
mkdir -p $out/share/locale mkdir -p $out/share/locale
'') ["doUnpack" "minInit" "defEnsureDir"]; '';
name = "xaos-" + version;
meta = { meta = {
homepage = http://xaos.sourceforge.net/; homepage = http://xaos.sourceforge.net/;
description = "Fractal viewer"; description = "Fractal viewer";
license = a.stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -13564,7 +13564,8 @@ let
x42-plugins = callPackage ../applications/audio/x42-plugins { }; 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; libpng = libpng12;
}; };