diff options
author | Carles Pagès <page@cubata.homelinux.net> | 2013-03-10 18:19:49 +0100 |
---|---|---|
committer | Carles Pagès <page@cubata.homelinux.net> | 2013-03-10 18:19:49 +0100 |
commit | 6c949148b6966d53f6a9e0389932221f860caae3 (patch) | |
tree | d87e4921fb1faadfdf56441a697244aabf99ad7c /pkgs/applications/window-managers | |
parent | 728116ec3eb04fe7c9465a240eab75e745e78d74 (diff) | |
parent | 2c13f0fd2043b8b19834eba544987b0f5c1eb68d (diff) | |
download | nixlib-6c949148b6966d53f6a9e0389932221f860caae3.tar nixlib-6c949148b6966d53f6a9e0389932221f860caae3.tar.gz nixlib-6c949148b6966d53f6a9e0389932221f860caae3.tar.bz2 nixlib-6c949148b6966d53f6a9e0389932221f860caae3.tar.lz nixlib-6c949148b6966d53f6a9e0389932221f860caae3.tar.xz nixlib-6c949148b6966d53f6a9e0389932221f860caae3.tar.zst nixlib-6c949148b6966d53f6a9e0389932221f860caae3.zip |
Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts: pkgs/development/libraries/mesa/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/compiz/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index ba9d9574366a..46aa6e4d77eb 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -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" \ |