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

2 files changed, 31 insertions, 13 deletions

diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 7efacafd6a1c..5a79c0829b5a 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -1,10 +1,8 @@
-{ stdenv, fetchurl, pkgconfig
-, dbus, libconfig, libdrm, libxml2, mesa, pcre
-, libXcomposite, libXfixes, libXdamage, libXinerama
-, libXrandr, libXrender, libXext }:
+{ stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre,
+  libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender,
+  libXext, xwininfo }:
 
 stdenv.mkDerivation rec {
-
   name = "compton-0.1_beta2";
 
   src = fetchurl {
@@ -12,18 +10,36 @@ stdenv.mkDerivation rec {
     sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v";
   };
 
-  buildInputs = [ pkgconfig dbus libconfig libdrm libxml2 mesa pcre
-    libXcomposite libXfixes libXdamage libXinerama libXrandr libXrender libXext ];
+  buildInputs = [
+    pkgconfig
+    dbus
+    libconfig
+    libdrm
+    libxml2
+    mesa
+    pcre
+    libXcomposite
+    libXfixes
+    libXdamage
+    libXinerama
+    libXrandr
+    libXrender
+    libXext
+  ];
+  
+  propagatedBuildInputs = [ xwininfo ];
+  
   installFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/chjj/compton/;
     description = "A fork of XCompMgr, a sample compositing manager for X servers";
     longDescription = ''
-      A fork of XCompMgr, which is a  sample compositing manager for X servers
-      supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables
-      basic eye-candy effects. This fork adds additional features, such as additional
-      effects, and a fork at a well-defined and proper place.
+      A fork of XCompMgr, which is a sample compositing manager for X
+      servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
+      extensions. It enables basic eye-candy effects. This fork adds
+      additional features, such as additional effects, and a fork at a
+      well-defined and proper place.
     '';
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index f4907f881af8..afa7d123107b 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
   docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre,
   pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
-  libXrandr, libXrender }:
+  libXrandr, libXrender, xwininfo }:
 
 stdenv.mkDerivation {
   name = "compton-git-2015-09-21";
@@ -37,6 +37,8 @@ stdenv.mkDerivation {
     pcre
   ];
 
+  propagatedBuildInputs = [ xwininfo ];
+
   installFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
@@ -47,7 +49,7 @@ stdenv.mkDerivation {
     longDescription = ''
       A fork of XCompMgr, which is a sample compositing manager for X
       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
       well-defined and proper place.
     '';