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

Merge pull request #45729 from Enzime/update/compton-git

Browse Source 
compton, compton-git: Merge derivations and update version
This commit is contained in:
Jörg Thalheim 2018-08-29 09:07:09 +01:00 committed by GitHub
commit 79c7ce8d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,59 +3,77 @@
, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
, libXinerama, libXrandr, libXrender, libXext, xwininfo }:
stdenv.mkDerivation rec {
name = "compton-0.1_beta2.5";
let
common = source: stdenv.mkDerivation (source // rec {
name = "${source.pname}-${source.version}";
src = fetchFromGitHub {
owner = "chjj";
repo = "compton";
rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
};
buildInputs = [
dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
libXinerama libdrm pcre libxml2 libxslt libconfig libGL
];
buildInputs = [
libX11
libXcomposite
libXdamage
libXrender
libXrandr
libXext
libXinerama
libdrm
pcre
libconfig
dbus
libGL
];
nativeBuildInputs = [
pkgconfig
asciidoc
docbook_xml_dtd_45
docbook_xsl
makeWrapper
];
nativeBuildInputs = [
pkgconfig
asciidoc
libxml2
docbook_xml_dtd_45
docbook_xsl
libxslt
makeWrapper
];
installFlags = [ "PREFIX=$(out)" ];
installFlags = [ "PREFIX=$(out)" ];
postInstall = ''
wrapProgram $out/bin/compton-trans \
--prefix PATH : ${lib.makeBinPath [ xwininfo ]}
'';
meta = with stdenv.lib; {
homepage = https://github.com/chjj/compton/;
description = "A fork of XCompMgr, a sample compositing manager for X servers";
longDescription = ''
A fork of XCompMgr, which is a sample compositing manager for X
servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
extensions. It enables basic eye-candy effects. This fork adds
additional features, such as additional effects, and a fork at a
well-defined and proper place.
postInstall = ''
wrapProgram $out/bin/compton-trans \
--prefix PATH : ${lib.makeBinPath [ xwininfo ]}
'';
license = licenses.mit;
platforms = platforms.linux;
meta = with lib; {
description = "A fork of XCompMgr, a sample compositing manager for X servers";
longDescription = ''
A fork of XCompMgr, which is a sample compositing manager for X
servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
extensions. It enables basic eye-candy effects. This fork adds
additional features, such as additional effects, and a fork at a
well-defined and proper place.
'';
license = licenses.mit;
maintainers = with maintainers; [ ertes enzime twey ];
platforms = platforms.linux;
};
});
stableSource = {
pname = "compton";
version = "0.1_beta2.5";
src = fetchFromGitHub {
owner = "chjj";
repo = "compton";
rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
};
meta = {
homepage = https://github.com/chjj/compton/;
};
};
gitSource = {
pname = "compton-git";
version = "2018-08-14";
src = fetchFromGitHub {
owner = "yshui";
repo = "compton";
rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f";
sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5";
};
meta = {
homepage = https://github.com/yshui/compton/;
};
};
in {
compton = common stableSource;
compton-git = common gitSource;
}

60
pkgs/applications/window-managers/compton/git.nix
View File

@ -1,60 +0,0 @@
{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
libXrandr, libXrender, xwininfo }:
stdenv.mkDerivation rec {
name = "compton-git-${version}";
version = "2018-05-21";
src = fetchFromGitHub {
owner = "yshui";
repo = "compton";
rev = "9b24550814b7c69065f90039b0a5d0a2281b9f81";
sha256 = "09nn0q9lgv59chfxljips0n8vnwwxi1yz6hmcsiggsl3zvpabpxl";
};
nativeBuildInputs = [
asciidoc
docbook_xml_dtd_45
docbook_xsl
pkgconfig
];
buildInputs = [
dbus
libXcomposite
libXdamage
libXext
libXfixes
libXinerama
libXrandr
libXrender
libconfig
libdrm
libxml2
libxslt
libGLU_combined
pcre
];
propagatedBuildInputs = [ xwininfo ];
installFlags = "PREFIX=$(out)";
meta = with stdenv.lib; {
description =
"A fork of XCompMgr, a sample compositing manager for X servers (git version)";
homepage = https://github.com/yshui/compton/;
license = licenses.mit;
longDescription = ''
A fork of XCompMgr, which is a sample compositing manager for X
servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
extensions. It enables basic eye-candy effects. This fork adds
additional features, such as additional effects, and a fork at a
well-defined and proper place.
'';
maintainers = [ maintainers.ertes maintainers.twey ];
platforms = platforms.linux;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -19364,9 +19364,7 @@ with pkgs;
inherit (xorg) xcompmgr;
compton = callPackage ../applications/window-managers/compton { };
compton-git = callPackage ../applications/window-managers/compton/git.nix { };
inherit (callPackage ../applications/window-managers/compton {}) compton compton-git;
xdaliclock = callPackage ../tools/misc/xdaliclock {};