Merge pull request #9481 from rycee/fix/xdaliclock

xdaliclock: replace use of builderDefsPackage

1 files changed, 18 insertions, 43 deletions

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 16a54c819464..33c9489a70d0 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -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;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"];
+  sourceRoot = "${name}/X11";
 
-  prepareDirs = a.fullDepEntry ''
-    mkdir -p "$out/bin" "$out/share" "$out/share/man/man1"
-  '' ["minInit" "defEnsureDir"];
+  buildInputs = [ libX11 xproto libXt libICE libSM libXext ];
 
-  goSrcDir = "cd X11";
+  preInstall = ''
+    mkdir -vp $out/bin $out/share/man/man1
+  '';
 
-  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
+}