Some fixes to CompizFusion. With proper ~-setup works now.

svn path=/nixpkgs/trunk/; revision=9585
This commit is contained in:
Michael Raskin 2007-11-05 16:07:35 +00:00
parent 623437eaa2
commit 3ef5e62b2f
4 changed files with 7 additions and 6 deletions

View File

@ -6,7 +6,7 @@ args : with args;
sha256 = "0im67mxnm30a3xd3rvfwrgfp4ic2x5axpjdahx0f5p9pnfy0jm4n";
};
buildInputs = (import ../general-dependencies.nix args) ++
[libcompizconfig bcop python pyrex];
[libcompizconfig bcop python pyrex configBackendGConf];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;

View File

@ -6,14 +6,15 @@ args : with args;
sha256 = "0h0r9sicc4pla5vag0j5qkllyagbs8dv5ai7fga48ln7q35y2mjr";
};
buildInputs = (import ../general-dependencies.nix args) ++
[libcompizconfig bcop];
[bcop libcompizconfig];
configureFlags = [];
forceShare = ["man" "doc" "info" "lib/compizconfig"];
} null; /* null is a terminator for sumArgs */
with stringsWithDeps;
stdenv.mkDerivation rec {
name = "compizconfig-backend-GConf-"+version;
builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]);
(textClosure [doAutotools doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Compiz configuration backend (GConf).

View File

@ -3,9 +3,9 @@ rec
{
bcop = import ./bcop args;
libcompizconfig = import ./libcompizconfig (args // {inherit bcop;});
configBackendGConf = import ./config-backend (args // {inherit libcompizconfig bcop;});
configBackendGConf = import ./config-backend (args // {inherit bcop libcompizconfig;});
compizConfigPython = import ./compizconfig-python (args // {inherit libcompizconfig
bcop pyrex;});
bcop pyrex configBackendGConf;});
ccsm = import ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
pluginsMain = import ./main (args //{inherit bcop ;});
compizManager = import ./compiz-manager (args // {inherit bcop ccsm;});

View File

@ -9,7 +9,7 @@ args : with args;
stdenv.mkDerivation rec {
name = "${abort "Specify name"}";
builder = writeScript (name + "-builder")
(textClosure [(abort "Specify phases - defined here or in builderDefs")]);
(textClosure [(abort "Specify phases - defined here or in builderDefs") doForceShare doPropagate]);
meta = {
description = "
${abort "Write a description"}