From 67e2cb0a02dfda59431e6fc60c085929e29886ce Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 5 Jan 2021 20:42:48 -0300 Subject: [PATCH 1/2] picom: misc fixes - Build option `build_docs` was renamed to `with_docs` quite sometime ago: https://github.com/yshui/picom/commit/3f2a6718dfb84110862ef3b51b2c961898f21bfd. This means that the manpage were not being build. - Remove CFLAG `-fno-strict-aliasing` seems to not be used anywhere in the upstream repository. This was probably added for `compton` a long time ago and never removed, since I can't find the commit that added this. - Use release build. This is recommended upstream: https://github.com/yshui/picom#to-build. --- pkgs/applications/window-managers/picom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 2bfd4f7e085f..f74204734255 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, uthash, asciidoc, docbook_xml_dtd_45 +{ stdenv, lib, fetchFromGitHub, pkg-config, uthash, asciidoc, docbook_xml_dtd_45 , docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11 @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config uthash asciidoc docbook_xml_dtd_45 @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { libxdg_basedir ]; - NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; + mesonBuildType = "release"; mesonFlags = [ - "-Dbuild_docs=true" + "-Dwith_docs=true" ]; installFlags = [ "PREFIX=$(out)" ]; From 5902802e14639abc91561ea9cf2cd6a16644b712 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 6 Jan 2021 19:20:05 -0300 Subject: [PATCH 2/2] picom: add thiagokokada as maintainer --- pkgs/applications/window-managers/picom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index f74204734255..4287dd2db020 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; homepage = "https://github.com/yshui/picom"; - maintainers = with maintainers; [ ertes twey ]; + maintainers = with maintainers; [ ertes twey thiagokokada ]; platforms = platforms.linux; }; }