Merge pull request #108530 from thiagokokada/picom-misc-fixes

This commit is contained in:
Sandro 2021-01-07 00:46:03 +01:00 committed by GitHub
commit be104bfc74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 , docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja
, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
, dbus, libconfig, libdrm, libGL, pcre, libX11 , dbus, libconfig, libdrm, libGL, pcre, libX11
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja meson ninja
pkgconfig pkg-config
uthash uthash
asciidoc asciidoc
docbook_xml_dtd_45 docbook_xml_dtd_45
@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
libxdg_basedir libxdg_basedir
]; ];
NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; mesonBuildType = "release";
mesonFlags = [ mesonFlags = [
"-Dbuild_docs=true" "-Dwith_docs=true"
]; ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.mit; license = licenses.mit;
homepage = "https://github.com/yshui/picom"; homepage = "https://github.com/yshui/picom";
maintainers = with maintainers; [ ertes twey ]; maintainers = with maintainers; [ ertes twey thiagokokada ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }