nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiz: fix build and update

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-23 15:10:01 +01:00
parent 5f758e6ea3
commit 4ebcc87f6b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/window-managers/compiz/default.nix
View File

@ -1,6 +1,7 @@
{stdenv, fetchurl, cmake, pkgconfig {stdenv, fetchurl, cmake, pkgconfig
, libXrender, renderproto, gtk, libwnck, pango, cairo , libXrender, renderproto, gtk, libwnck, pango, cairo
, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
, metacity
, libstartup_notification, libpthreadstubs, libxcb, intltool , libstartup_notification, libpthreadstubs, libxcb, intltool
, ORBit2, libXau , ORBit2, libXau
, dbus, dbus_glib, librsvg, mesa , dbus, dbus_glib, librsvg, mesa
@ -14,15 +15,15 @@ let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="compiz"; baseName="compiz";
version="0.9.8.6"; version="0.9.9.0";
name="compiz-0.9.8.6"; name="compiz-${version}";
hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6"; url="https://launchpad.net/compiz/0.9.9/${version}/+download/${name}.tar.bz2";
url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2"; sha256="0nxv9lv0zwzs82p2d5g38sbvzbqgfs837xdgwc26lh5wdv31d93s";
sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
}; };
buildInputs = [cmake pkgconfig buildInputs = [cmake pkgconfig
libXrender renderproto gtk libwnck pango cairo libXrender renderproto gtk libwnck pango cairo
GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
metacity
libpthreadstubs libxcb intltool libpthreadstubs libxcb intltool
ORBit2 libXau ORBit2 libXau
dbus dbus_glib librsvg mesa dbus dbus_glib librsvg mesa
@ -40,7 +41,8 @@ stdenv.mkDerivation rec {
}; };
inherit buildInputs; inherit buildInputs;
NIX_CFLAGS_COMPILE=" -Wno-error "; NIX_CFLAGS_COMPILE = " -Wno-error ";
NIX_CFLAGS_LINK = "-lm -ldl -pthread -lutil";
postInstall = '' postInstall = ''
wrapProgram "$out/bin/ccsm" \ wrapProgram "$out/bin/ccsm" \
--prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PYTHONPATH : "$PYTHONPATH" \

3
pkgs/top-level/all-packages.nix
View File

@ -6644,7 +6644,8 @@ let
cmus = callPackage ../applications/audio/cmus { }; cmus = callPackage ../applications/audio/cmus { };
compiz = callPackage ../applications/window-managers/compiz { 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; intltool = intltool_standalone;
}; };