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

Merge remote-tracking branch 'upstream/x-updates' into wayland

Browse Source 
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Carles Pagès
2013-03-10 18:19:49 +01:00
parent 728116ec3e 2c13f0fd20
commit 6c949148b6
903 changed files with 10029 additions and 9214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/compiz/default.nix
+8 -6
View File
@@ -1,6 +1,7 @@
{stdenv, fetchurl, cmake, pkgconfig
, libXrender, renderproto, gtk, libwnck, pango, cairo
, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
, metacity
, libstartup_notification, libpthreadstubs, libxcb, intltool
, ORBit2, libXau
, dbus, dbus_glib, librsvg, mesa
@@ -14,15 +15,15 @@ let
s = # Generated upstream information
rec {
baseName="compiz";
version="0.9.8.6";
name="compiz-0.9.8.6";
hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2";
sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
version="0.9.9.0";
name="compiz-${version}";
url="https://launchpad.net/compiz/0.9.9/${version}/+download/${name}.tar.bz2";
sha256="0nxv9lv0zwzs82p2d5g38sbvzbqgfs837xdgwc26lh5wdv31d93s";
};
buildInputs = [cmake pkgconfig
libXrender renderproto gtk libwnck pango cairo
GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
metacity
libpthreadstubs libxcb intltool
ORBit2 libXau
dbus dbus_glib librsvg mesa
@@ -40,7 +41,8 @@ stdenv.mkDerivation rec {
};
inherit buildInputs;
NIX_CFLAGS_COMPILE=" -Wno-error ";
NIX_CFLAGS_COMPILE = " -Wno-error ";
NIX_CFLAGS_LINK = "-lm -ldl -pthread -lutil";
postInstall = ''
wrapProgram "$out/bin/ccsm" \
--prefix PYTHONPATH : "$PYTHONPATH" \