Author: urkud
Date: Thu Aug 25 20:00:55 2011
New Revision: 28816
URL: https://svn.nixos.org/websvn/nix/?rev=28816&sc=1
Log:
Add meta to kde-4.7 'subdir' pkgs
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Thu Aug 25
18:37:52 2011 (r28815)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Thu Aug 25
20:00:55 2011 (r28816)
@@ -39,13 +39,14 @@
kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}:
let name_ = name; in
- a@{cmakeFlags ? [], name ? name_, ...}:
+ a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc module;
cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
"-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
- } // (removeAttrs a [ "cmakeFlags" ]));
+ meta = defMeta // meta;
+ } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module
kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
