diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-01-05 20:42:48 -0300 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-01-06 19:18:41 -0300 |
| commit | 67e2cb0a02dfda59431e6fc60c085929e29886ce (patch) | |
| tree | 8b1d79e32ee461ec419cfcae69331e48e1bfa788 /pkgs/applications/window-managers | |
| parent | 544d4f3a91fc55ddb475bbc8adc31f9e783c2881 (diff) | |
| download | nixpkgs-67e2cb0a02dfda59431e6fc60c085929e29886ce.tar nixpkgs-67e2cb0a02dfda59431e6fc60c085929e29886ce.tar.gz nixpkgs-67e2cb0a02dfda59431e6fc60c085929e29886ce.tar.bz2 nixpkgs-67e2cb0a02dfda59431e6fc60c085929e29886ce.tar.lz nixpkgs-67e2cb0a02dfda59431e6fc60c085929e29886ce.tar.xz nixpkgs-67e2cb0a02dfda59431e6fc60c085929e29886ce.tar.zst nixpkgs-67e2cb0a02dfda59431e6fc60c085929e29886ce.zip | |
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.
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/picom/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 2bfd4f7e085..f7420473425 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)" ]; |