Author: raskin
Date: Wed Nov 3 21:57:42 2010
New Revision: 24589
URL: https://svn.nixos.org/websvn/nix/?rev=24589&sc=1
Log:
Update fbpanel
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/fbpanel/default.nix
Modified: nixpkgs/trunk/pkgs/applications/window-managers/fbpanel/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/window-managers/fbpanel/default.nix Wed Nov
3 20:54:20 2010 (r24588)
+++ nixpkgs/trunk/pkgs/applications/window-managers/fbpanel/default.nix Wed Nov
3 21:57:42 2010 (r24589)
@@ -1,24 +1,53 @@
-{ stdenv, fetchurl, builderDefs, libX11, gtk, pkgconfig, libXmu
-, libXpm, libpng, libjpeg, libtiff, librsvg }:
+...@{builderdefspackage
+ , libX11, gtk, pkgconfig, libXmu
+ , libXpm, libpng, libjpeg, libtiff, librsvg
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
- let localDefs = builderDefs.passthru.function {
- src = /* put a fetchurl here */
- fetchurl {
- url =
http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz;
- sha256 = "0zv0zkq6w4h7dk0ji8bm9cqpj2qxv3ss161mqg9y68shvxvmfrlz";
- };
+ 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;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["setVars" "doUnpack" "fixPaths" "doConfigure" "doMakeInstall"];
+
+ fixPaths=(a.doPatchShebangs ".");
+ setVars = a.fullDepEntry ''
+ export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
+ '' [];
+
+ meta = {
+ description = "${abort ''Specify description''}";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "fbpanel.sourceforge.net";
+ };
+ };
+}) x
- buildInputs = [libX11 gtk pkgconfig libXmu libXpm
- libpng libjpeg libtiff librsvg];
- configureFlags = [];
- }; /* null is a terminator for sumArgs */
- in with localDefs;
-stdenv.mkDerivation rec {
- name = "fbpanel-4.12";
- builder = writeScript (name + "-builder")
- (textClosure localDefs [doConfigure doMakeInstall doForceShare
doPropagate]);
- meta = {
- description = "Just a desktop panel";
- inherit src;
- };
-}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
