public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54914 from dtzWill/update/compton-git-v5

Browse Source 
compton-git: 2 -> 5
This commit is contained in:
Jörg Thalheim 2019-01-30 08:15:09 +00:00 committed by GitHub
commit b35cee1160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkgs/applications/window-managers/compton/default.nix
View File

@ -1,18 +1,14 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 { stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
, docbook_xsl, libxslt, libxml2, makeWrapper , docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja
, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
, libXinerama, libXrandr, libXrender, libXext, xwininfo }: , libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }:
let let
common = source: stdenv.mkDerivation (source // rec { common = source: stdenv.mkDerivation (source // rec {
name = "${source.pname}-${source.version}"; name = "${source.pname}-${source.version}";
buildInputs = [ nativeBuildInputs = (source.nativeBuildInputs or []) ++ [
dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
libXinerama libdrm pcre libxml2 libxslt libconfig libGL
];
nativeBuildInputs = [
pkgconfig pkgconfig
asciidoc asciidoc
docbook_xml_dtd_45 docbook_xml_dtd_45
@ -48,6 +44,11 @@ let
COMPTON_VERSION = version; COMPTON_VERSION = version;
buildInputs = [
dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
libXinerama libdrm pcre libxml2 libxslt libconfig libGL
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chjj"; owner = "chjj";
repo = "compton"; repo = "compton";
@ -62,17 +63,45 @@ let
gitSource = rec { gitSource = rec {
pname = "compton-git"; pname = "compton-git";
version = "2"; version = "5";
COMPTON_VERSION = "v${version}"; COMPTON_VERSION = "v${version}";
nativeBuildInputs = [ meson ninja ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yshui"; owner = "yshui";
repo = "compton"; repo = "compton";
rev = COMPTON_VERSION; rev = COMPTON_VERSION;
sha256 = "1b6jgkkjbmgm7d7qjs94h722kgbqjagcxznkh2r84hcmcl8pibjq"; sha256 = "1x5r2dch023imgdqhgf1zxi05cc742s7xr7jzpymvl9ldqly8ppa";
}; };
buildInputs = [
dbus libX11 libXext
xorgproto
libXinerama libdrm pcre libxml2 libxslt libconfig libGL
# Removed:
# libXcomposite libXdamage libXrender libXrandr
# New:
libxcb xcbutilrenderutil xcbutilimage
pixman libev
libxdg_basedir
];
preBuild = ''
git() { echo "v${version}"; }
export -f git
'';
NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
mesonFlags = [
"-Dvsync_drm=true"
"-Dnew_backends=true"
"-Dbuild_docs=true"
];
meta = { meta = {
homepage = https://github.com/yshui/compton/; homepage = https://github.com/yshui/compton/;
}; };