diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-12-15 12:10:42 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-12-15 12:10:42 +0000 |
commit | 6a83330e8b349116a12dca87caf524842a475b0f (patch) | |
tree | dd8b81ee1f8d6134604a043d19c909cdbf5bdda5 /pkgs/applications/window-managers | |
parent | a0657e021ff419265250e92bc973fa4054cd0128 (diff) | |
download | nixlib-6a83330e8b349116a12dca87caf524842a475b0f.tar nixlib-6a83330e8b349116a12dca87caf524842a475b0f.tar.gz nixlib-6a83330e8b349116a12dca87caf524842a475b0f.tar.bz2 nixlib-6a83330e8b349116a12dca87caf524842a475b0f.tar.lz nixlib-6a83330e8b349116a12dca87caf524842a475b0f.tar.xz nixlib-6a83330e8b349116a12dca87caf524842a475b0f.tar.zst nixlib-6a83330e8b349116a12dca87caf524842a475b0f.zip |
Using old compizManager by default.
svn path=/nixpkgs/trunk/; revision=13635
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/window-managers/compiz-fusion/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix index 689885d29b44..c53b8586f1ce 100644 --- a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.6.0/compiz-manager-0.6.0.tar.bz2; @@ -19,7 +19,7 @@ args : with args; "INDIRECT" "yes" "XORG_DRIVER_PATH" "/nix/store/.*" ]]; - } null; /* null is a terminator for sumArgs */ + }; in with localDefs; let install = FullDepEntry (" diff --git a/pkgs/applications/window-managers/compiz-fusion/default.nix b/pkgs/applications/window-managers/compiz-fusion/default.nix index 334af5eb0122..bfd0810facf0 100644 --- a/pkgs/applications/window-managers/compiz-fusion/default.nix +++ b/pkgs/applications/window-managers/compiz-fusion/default.nix @@ -10,6 +10,6 @@ rec ccsm = selectVersion ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); pluginsMain = selectVersion ./main (args //{inherit bcop ;}); pluginsExtra = selectVersion ./extra (args //{inherit bcop pluginsMain;}); - compizManager = selectVersion ./compiz-manager (args // {inherit bcop ccsm;}); + compizManager = (import ./compiz-manager/0.6.0.nix) (args // {inherit bcop ccsm;}); ccsmSimple = selectVersion ./ccsm-simple (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); } |