Merge remote-tracking branch 'origin/master' into closure-size

pkgs/applications/window-managers/fbpanel/default.nix

@@ -1,53 +1,30 @@
-x@{builderDefsPackage
-  , libX11, gtk, pkgconfig, libXmu
-  , libXpm, libpng, libjpeg, libtiff, librsvg
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, pkgconfig
+, libX11, libXmu, libXpm, gtk, libpng, libjpeg, libtiff, librsvg
+}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="fbpanel";
-    version="6.1";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${baseName}/${name}.tbz2";
-    hash="e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "fbpanel-${version}";
+  version = "6.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/fbpanel/${name}.tbz2";
+    sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
   };
+  buildInputs =
+    [ pkgconfig libX11 libXmu libXpm gtk libpng libjpeg libtiff librsvg ];
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  preConfigure = "patchShebangs .";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doUnpack" "fixPaths" "doConfigure" "doMakeInstall"];
+  NIX_LDFLAGS="-lX11";
 
-  fixPaths=(a.doPatchShebangs ".");
-  setVars = a.fullDepEntry ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
-  '' [];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "A stand-alone panel";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; linux;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "fbpanel.sourceforge.net";
     };
   };
-}) x
-
+}

pkgs/applications/window-managers/stalonetray/default.nix

@@ -1,47 +1,23 @@
-x@{builderDefsPackage
-  , libX11, xproto
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, libX11, xproto }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="stalonetray";
-    version="0.8.1";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${baseName}/${name}.tar.bz2";
-    hash="1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "stalonetray-${version}";
+  version = "0.8.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/stalonetray/${name}.tar.bz2";
+    sha256 = "1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll";
   };
+  buildInputs = [ libX11 xproto ];
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "Stand alone tray";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; linux;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://sourceforge.net/projects/stalonetray/files/";
     };
   };
-}) x
-
+}

pkgs/applications/window-managers/tabbed/default.nix

@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     description = "Simple generic tabbed fronted to xembed aware applications";
     license = licenses.mit;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/applications/window-managers/vwm/default.nix

@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Dynamic window manager for the console";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }