@@ -3,110 +3,67 @@
33, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
44, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
55, libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }:
6+stdenv.mkDerivation rec {
7+ pname = "compton";
8+ version = "6.2";
69
7−let
8− common = source: stdenv.mkDerivation (source // rec {
9− name = "${source.pname}-${source.version}";
10+ COMPTON_VERSION = "v${version}";
1011
11− nativeBuildInputs = (source.nativeBuildInputs or []) ++ [
12− pkgconfig
13− asciidoc
14− docbook_xml_dtd_45
15− docbook_xsl
16− makeWrapper
17− ];
18−
19− installFlags = [ "PREFIX=$(out)" ];
20−
21− postInstall = ''
22− wrapProgram $out/bin/compton-trans \
23− --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
24− '';
25−
26− meta = with lib; {
27− description = "A fork of XCompMgr, a sample compositing manager for X servers";
28− longDescription = ''
29− A fork of XCompMgr, which is a sample compositing manager for X
30− servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
31− extensions. It enables basic eye-candy effects. This fork adds
32− additional features, such as additional effects, and a fork at a
33− well-defined and proper place.
34− '';
35− license = licenses.mit;
36− maintainers = with maintainers; [ ertes enzime twey ];
37− platforms = platforms.linux;
38− };
39− });
40−
41− stableSource = rec {
42− pname = "compton";
43− version = "0.1_beta2.5";
44−
45− COMPTON_VERSION = version;
46−
47− buildInputs = [
48− dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
49− libXinerama libdrm pcre libxml2 libxslt libconfig libGL
50− ];
51−
52− src = fetchFromGitHub {
53− owner = "chjj";
54− repo = "compton";
55− rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
56− sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
57− };
58−
59− meta = {
60− homepage = https://github.com/chjj/compton/;
61− };
12+ src = fetchFromGitHub {
13+ owner = "yshui";
14+ repo = "compton";
15+ rev = COMPTON_VERSION;
16+ sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7";
6217 };
6318
64− gitSource = rec {
65− pname = "compton-git";
66− version = "5.1-rc2";
67−
68− COMPTON_VERSION = "v${version}";
69−
70− nativeBuildInputs = [ meson ninja ];
71−
72− src = fetchFromGitHub {
73− owner = "yshui";
74− repo = "compton";
75− rev = COMPTON_VERSION;
76− sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08";
77− };
78−
79− buildInputs = [
80− dbus libX11 libXext
81− xorgproto
82− libXinerama libdrm pcre libxml2 libxslt libconfig libGL
83− # Removed:
84− # libXcomposite libXdamage libXrender libXrandr
85−
86− # New:
87− libxcb xcbutilrenderutil xcbutilimage
88− pixman libev
89− libxdg_basedir
90− ];
91−
92− preBuild = ''
93− git() { echo "v${version}"; }
94− export -f git
19+ nativeBuildInputs = [
20+ meson ninja
21+ pkgconfig
22+ asciidoc
23+ docbook_xml_dtd_45
24+ docbook_xsl
25+ makeWrapper
26+ ];
27+
28+ buildInputs = [
29+ dbus libX11 libXext
30+ xorgproto
31+ libXinerama libdrm pcre libxml2 libxslt libconfig libGL
32+ libxcb xcbutilrenderutil xcbutilimage
33+ pixman libev
34+ libxdg_basedir
35+ ];
36+
37+ NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
38+
39+ mesonFlags = [
40+ "-Dbuild_docs=true"
41+ ];
42+
43+ preBuild = ''
44+ git() { echo "v${version}"; }
45+ export -f git
46+ '';
47+
48+ installFlags = [ "PREFIX=$(out)" ];
49+
50+ postInstall = ''
51+ wrapProgram $out/bin/compton-trans \
52+ --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
53+ '';
54+
55+ meta = with lib; {
56+ description = "A fork of XCompMgr, a sample compositing manager for X servers";
57+ longDescription = ''
58+ A fork of XCompMgr, which is a sample compositing manager for X
59+ servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
60+ extensions. It enables basic eye-candy effects. This fork adds
61+ additional features, such as additional effects, and a fork at a
62+ well-defined and proper place.
9563 '';
96−
97− NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
98−
99− mesonFlags = [
100− "-Dvsync_drm=true"
101− "-Dnew_backends=true"
102− "-Dbuild_docs=true"
103− ];
104−
105− meta = {
106− homepage = https://github.com/yshui/compton/;
107− };
64+ license = licenses.mit;
65+ homepage = "https://github.com/yshui/compton";
66+ maintainers = with maintainers; [ ertes enzime twey ];
67+ platforms = platforms.linux;
10868 };
109−in {
110− compton = common stableSource;
111− compton-git = common gitSource;
11269}