diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 15:10:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 15:10:01 +0100 |
| commit | 4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90 (patch) | |
| tree | 6952d967424cc32b62c87cc41024bc74dac37941 /pkgs | |
| parent | 5f758e6ea38be047b02f862d6a40b71c28788958 (diff) | |
| download | nixlib-4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90.tar nixlib-4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90.tar.gz nixlib-4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90.tar.bz2 nixlib-4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90.tar.lz nixlib-4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90.tar.xz nixlib-4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90.tar.zst nixlib-4ebcc87f6b8050878f5ae789fa94d6a2ddcf5f90.zip | |
compiz: fix build and update
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/compiz/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 10 insertions, 7 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" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e174390081..10926f299d3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6644,7 +6644,8 @@ let cmus = callPackage ../applications/audio/cmus { }; compiz = callPackage ../applications/window-managers/compiz { - inherit (gnome) GConf ORBit2; + inherit (gnome) GConf ORBit2 metacity; + boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864 intltool = intltool_standalone; }; |