public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged with trunk again

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
This commit is contained in:
Yury G. Kudryashov
2008-01-23 18:11:03 +00:00
parent 4de89f61b0
commit da57804fff
109 changed files with 1394 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-bcop-0.6.0.tar.bz2;
@@ -9,6 +9,7 @@ args : with args;
propagatedBuildInputs = [getopt libxslt];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
fixPkgconfig = FullDepEntry ("
ensureDir \$out/lib
@@ -21,7 +22,7 @@ in
stdenv.mkDerivation rec {
name = "compiz-bcop-"+version;
builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare
(textClosure localDefs [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare
doPropagate]);
inherit propagatedBuildInputs;
meta = {
pkgs/applications/window-managers/compiz-fusion/ccsm/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/ccsm-0.6.0.tar.bz2;
@@ -15,10 +15,11 @@ args : with args;
"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "compizconfig-settings-"+args.version;
builder = writeScript (name + "-builder")
(textClosure [installPythonPackage (doWrap "\$out/bin/ccsm")]);
(textClosure localDefs [installPythonPackage (doWrap "\$out/bin/ccsm")]);
meta = {
description = "
Compiz Settings Manager
pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-manager-0.6.0.tar.bz2;
@@ -20,6 +20,7 @@ args : with args;
"XORG_DRIVER_PATH" "/nix/store/.*"
]];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
install = FullDepEntry ("
sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager
@@ -34,7 +35,7 @@ in
stdenv.mkDerivation rec {
name = "compiz-manager-"+args.version;
builder = writeScript (name + "-builder")
(textClosure [doUnpack doReplaceScripts install doPropagate doForceShare]);
(textClosure localDefs [doUnpack doReplaceScripts install doPropagate doForceShare]);
meta = {
description = "
Compiz Launch Manager
pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0.1/compizconfig-python-0.6.0.1.tar.bz2;
@@ -9,10 +9,11 @@ args : with args;
[libcompizconfig bcop python pyrex configBackendGConf];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "compizconfig-python-"+args.version;
builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]);
(textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]);
meta = {
description = "
Compiz configuration - Python part.
pkgs/applications/window-managers/compiz-fusion/config-backend/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compizconfig-backend-gconf-0.6.0.tar.bz2;
@@ -10,10 +10,11 @@ args : with args;
configureFlags = [];
forceShare = ["man" "doc" "info" "lib/compizconfig"];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "compizconfig-backend-GConf-"+version;
builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Compiz configuration backend (GConf).
pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-extra-0.6.0.tar.bz2;
@@ -9,6 +9,7 @@ args : with args;
[bcop libjpeg gettext pluginsMain];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
sharePlugins = FullDepEntry ("
ensureDir \$out/share/compiz-plugins
@@ -22,7 +23,7 @@ in
stdenv.mkDerivation rec {
name = "compiz-fusion-plugins-extra-"+version;
builder = writeScript (name + "-builder")
(textClosure [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]);
(textClosure localDefs [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]);
meta = {
description = "
Extra Compiz Fusion plugins.
pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/libcompizconfig-0.6.0.tar.bz2;
@@ -9,10 +9,11 @@ args : with args;
[bcop];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "libcompizconfig-"+version;
builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]);
(textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]);
meta = {
description = "
Compiz configuration backend library.
pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-main-0.6.0.tar.bz2;
@@ -9,6 +9,7 @@ args : with args;
[bcop libjpeg gettext];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
sharePlugins = FullDepEntry ("
ensureDir \$out/share/compiz-plugins
@@ -18,7 +19,7 @@ in
stdenv.mkDerivation rec {
name = "compiz-fusion-plugins-main-"+version;
builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall sharePlugins doForceShare]);
(textClosure localDefs [doConfigure doMakeInstall sharePlugins doForceShare]);
meta = {
description = "
Main Compiz Fusion plugins.
pkgs/applications/window-managers/compiz/0.6.2.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2;
@@ -22,6 +22,7 @@ args : with args;
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
patches = [ ./glx-patch-0.6.2.patch ];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
postAll = FullDepEntry ("
for i in $out/bin/*; do
@@ -36,7 +37,7 @@ stdenv.mkDerivation
rec {
name = "compiz-0.6.2";
builder = writeScript (name + "-builder")
(textClosure [doPatch doConfigure doMakeInstall doPropagate
(textClosure localDefs [doPatch doConfigure doMakeInstall doPropagate
doForceShare postAll]);
inherit propagatedBuildInputs;
meta = {
pkgs/applications/window-managers/fbpanel/4.12.nix
+3 -2
View File
@@ -1,5 +1,5 @@
args : with args;
with builderDefs {
let localDefs = builderDefs {
src = /* put a fetchurl here */
fetchurl {
url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz;
@@ -10,10 +10,11 @@ args : with args;
libpng libjpeg libtiff librsvg];
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "fbpanel";
builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]);
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Just a desktop panel.
pkgs/applications/window-managers/xmonad/default.nix
+42
View File
@@ -0,0 +1,42 @@
{stdenv, fetchurl, ghc, X11, xmessage}:
stdenv.mkDerivation (rec {
pname = "xmonad";
version = "0.5";
name = "${pname}-${version}";
src = fetchurl {
url = "http://hackage.haskell.org/packages/archive/${pname}/${version}/${name}.tar.gz";
sha256 = "cfcc4501b000fa740ed35a5be87dc01216e036219551630dcf71d9c3cf57e4c4";
};
buildInputs = [ghc X11];
meta = {
description = "xmonad is a tiling window manager for X";
};
configurePhase = ''
sed -i 's|"xmessage"|"${xmessage}/bin/xmessage"|' XMonad/Core.hs
ghc --make Setup.lhs
./Setup configure --prefix="$out"
'';
buildPhase = ''
./Setup build
'';
installPhase = ''
./Setup copy
./Setup register --gen-script
mkdir $out/nix-support
sed -i 's/|.*\(ghc-pkg update\)/| \1/' register.sh
cp register.sh $out/nix-support/register-ghclib.sh
sed -i 's/\(ghc-pkg update\)/\1 --user/' register.sh
mkdir -p $out/bin
cp register.sh $out/bin/register-ghclib-${name}.sh
'';
})