git.iko.soy/typeable/nixpkgs
on master help sign in
compton-git: 2 -> 5

https://github.com/yshui/compton/releases/tag/v3 https://github.com/yshui/compton/releases/tag/v4 https://github.com/yshui/compton/releases/tag/v5 Some fixes were made shortly after v5, should pick them up or wait for next release.

commit0658554ccc46ab2830bd9a9d6fe58eb392468c46 authorWill Dietz <w@wdtz.org> dateTue 29 Jan 2019, 19:54 (8 years ago) parent39104c2
1 file changed+40−10
pkgs/applications/window-managers/compton/default.nix+40−10
pkgs/applications/window-managers/compton/default.nix+40−10
@@ -1,18 +1,14 @@
11{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
2−, docbook_xsl, libxslt, libxml2, makeWrapper
2+, docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja
3+, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
34, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
4−, libXinerama, libXrandr, libXrender, libXext, xwininfo }:
5+, libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }:
56
67let
78 common = source: stdenv.mkDerivation (source // rec {
89 name = "${source.pname}-${source.version}";
910
10− buildInputs = [
11− dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
12− libXinerama libdrm pcre libxml2 libxslt libconfig libGL
13− ];
14−
15− nativeBuildInputs = [
11+ nativeBuildInputs = (source.nativeBuildInputs or []) ++ [
1612 pkgconfig
1713 asciidoc
1814 docbook_xml_dtd_45
@@ -48,6 +44,11 @@ let
4844
4945 COMPTON_VERSION = version;
5046
47+ buildInputs = [
48+ dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
49+ libXinerama libdrm pcre libxml2 libxslt libconfig libGL
50+ ];
51+
5152 src = fetchFromGitHub {
5253 owner = "chjj";
5354 repo = "compton";
@@ -62,17 +63,46 @@ let
6263
6364 gitSource = rec {
6465 pname = "compton-git";
65− version = "2";
66+ version = "5";
6667
6768 COMPTON_VERSION = "v${version}";
6869
70+ nativeBuildInputs = [ meson ninja ];
71+
6972 src = fetchFromGitHub {
7073 owner = "yshui";
7174 repo = "compton";
7275 rev = COMPTON_VERSION;
73− sha256 = "1b6jgkkjbmgm7d7qjs94h722kgbqjagcxznkh2r84hcmcl8pibjq";
76+ sha256 = "1x5r2dch023imgdqhgf1zxi05cc742s7xr7jzpymvl9ldqly8ppa";
7477 };
7578
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+ postPatch = ''
93+ substituteInPlace meson.build \
94+ --replace "run_command('git', 'describe')" \
95+ "run_command('echo', 'v${version}')"
96+ '';
97+
98+ NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
99+
100+ mesonFlags = [
101+ "-Dvsync_drm=true"
102+ "-Dnew_backends=true"
103+ "-Dbuild_docs=true"
104+ ];
105+
76106 meta = {
77107 homepage = https://github.com/yshui/compton/;
78108 };