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

compton: add xwininfo dependency for compton-trans; clean up (#16877)

Browse Source
This commit is contained in:
Andrew Jamison 2016-07-19 03:31:09 -04:00 committed by Franz Pletz
parent c09338d037
commit c6ba4cbde9
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/window-managers/compton/default.nix
View File

@ -1,10 +1,8 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre,
, dbus, libconfig, libdrm, libxml2, mesa, pcre libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender,
, libXcomposite, libXfixes, libXdamage, libXinerama libXext, xwininfo }:
, libXrandr, libXrender, libXext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compton-0.1_beta2"; name = "compton-0.1_beta2";
src = fetchurl { src = fetchurl {
@ -12,18 +10,36 @@ stdenv.mkDerivation rec {
sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v"; sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v";
}; };
buildInputs = [ pkgconfig dbus libconfig libdrm libxml2 mesa pcre buildInputs = [
libXcomposite libXfixes libXdamage libXinerama libXrandr libXrender libXext ]; pkgconfig
dbus
libconfig
libdrm
libxml2
mesa
pcre
libXcomposite
libXfixes
libXdamage
libXinerama
libXrandr
libXrender
libXext
];
propagatedBuildInputs = [ xwininfo ];
installFlags = "PREFIX=$(out)"; installFlags = "PREFIX=$(out)";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/chjj/compton/; homepage = https://github.com/chjj/compton/;
description = "A fork of XCompMgr, a sample compositing manager for X servers"; description = "A fork of XCompMgr, a sample compositing manager for X servers";
longDescription = '' longDescription = ''
A fork of XCompMgr, which is a sample compositing manager for X servers A fork of XCompMgr, which is a sample compositing manager for X
supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
basic eye-candy effects. This fork adds additional features, such as additional extensions. It enables basic eye-candy effects. This fork adds
effects, and a fork at a well-defined and proper place. additional features, such as additional effects, and a fork at a
well-defined and proper place.
''; '';
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;

6
pkgs/applications/window-managers/compton/git.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre, docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre,
pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
libXrandr, libXrender }: libXrandr, libXrender, xwininfo }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "compton-git-2015-09-21"; name = "compton-git-2015-09-21";
@ -37,6 +37,8 @@ stdenv.mkDerivation {
pcre pcre
]; ];
propagatedBuildInputs = [ xwininfo ];
installFlags = "PREFIX=$(out)"; installFlags = "PREFIX=$(out)";
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -47,7 +49,7 @@ stdenv.mkDerivation {
longDescription = '' longDescription = ''
A fork of XCompMgr, which is a sample compositing manager for X A fork of XCompMgr, which is a sample compositing manager for X
servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
extensions. It enables basic eye-candy effects. This fork adds extensions. It enables basic eye-candy effects. This fork adds
additional features, such as additional effects, and a fork at a additional features, such as additional effects, and a fork at a
well-defined and proper place. well-defined and proper place.
''; '';