Merge pull request #9481 from rycee/fix/xdaliclock

xdaliclock: replace use of builderDefsPackage
This commit is contained in:
Domen Kožar 2015-08-27 18:41:00 +02:00
commit 07ca74f60f

View file

@ -1,52 +1,27 @@
x@{builderDefsPackage
, libX11, xproto, libXt, libICE
, libSM, libXext
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, fetchurl, libX11, xproto, libXt, libICE, libSM, libXext }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="xdaliclock";
version = "2.43";
name="${baseName}-${version}";
project="${baseName}";
url="http://www.jwz.org/${project}/${name}.tar.gz";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
stdenv.mkDerivation rec {
name = "xdaliclock-${version}";
version = "2.43";
src = fetchurl {
url="http://www.jwz.org/xdaliclock/${name}.tar.gz";
sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
};
inherit (sourceInfo) name version;
inherit buildInputs;
sourceRoot = "${name}/X11";
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"];
buildInputs = [ libX11 xproto libXt libICE libSM libXext ];
prepareDirs = a.fullDepEntry ''
mkdir -p "$out/bin" "$out/share" "$out/share/man/man1"
'' ["minInit" "defEnsureDir"];
preInstall = ''
mkdir -vp $out/bin $out/share/man/man1
'';
goSrcDir = "cd X11";
meta = {
meta = with stdenv.lib; {
description = "A clock application that morphs digits when they are changed";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux ++ freebsd;
license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT
downloadPage = "http://www.jwz.org/xdaliclock/";
inherit version;
updateWalker = true;
maintainers = with maintainers; [ raskin rycee ];
platforms = with platforms; linux ++ freebsd;
license = licenses.free; #TODO BSD on Gentoo, looks like MIT
downloadPage = http://www.jwz.org/xdaliclock/;
};
}) x
}