diff options
author | Michael Hoang <enzime@users.noreply.github.com> | 2018-08-29 12:47:35 +1000 |
---|---|---|
committer | Michael Hoang <enzime@users.noreply.github.com> | 2018-08-29 12:47:35 +1000 |
commit | 8b7fe8910c78c460eac07f94cd7a4439fa792e55 (patch) | |
tree | c0bdf019f96f1aa120fa60da35d29a27496bc46d /pkgs/applications/window-managers | |
parent | 1173bde56fa640eabd8b350f8fdef64e2c13ad51 (diff) | |
download | nixlib-8b7fe8910c78c460eac07f94cd7a4439fa792e55.tar nixlib-8b7fe8910c78c460eac07f94cd7a4439fa792e55.tar.gz nixlib-8b7fe8910c78c460eac07f94cd7a4439fa792e55.tar.bz2 nixlib-8b7fe8910c78c460eac07f94cd7a4439fa792e55.tar.lz nixlib-8b7fe8910c78c460eac07f94cd7a4439fa792e55.tar.xz nixlib-8b7fe8910c78c460eac07f94cd7a4439fa792e55.tar.zst nixlib-8b7fe8910c78c460eac07f94cd7a4439fa792e55.zip |
compton, compton-git: Merge derivations
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/compton/default.nix | 122 | ||||
-rw-r--r-- | pkgs/applications/window-managers/compton/git.nix | 60 |
2 files changed, 70 insertions, 112 deletions
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index d79d8c3325d7..e5faf084a42d 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -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"; - - src = fetchFromGitHub { - owner = "chjj"; - repo = "compton"; - rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; - sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; - }; +let + common = source: stdenv.mkDerivation (source // rec { + name = "${source.pname}-${source.version}"; + + buildInputs = [ + dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext + libXinerama libdrm pcre libxml2 libxslt libconfig libGL + ]; + + nativeBuildInputs = [ + pkgconfig + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + ]; - buildInputs = [ - libX11 - libXcomposite - libXdamage - libXrender - libXrandr - libXext - libXinerama - libdrm - pcre - libconfig - dbus - libGL - ]; - - nativeBuildInputs = [ - pkgconfig - asciidoc - libxml2 - docbook_xml_dtd_45 - docbook_xsl - libxslt - makeWrapper - ]; - - 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. + installFlags = [ "PREFIX=$(out)" ]; + + 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; } diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix deleted file mode 100644 index 89be02bf9e61..000000000000 --- a/pkgs/applications/window-managers/compton/git.nix +++ /dev/null @@ -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-08-14"; - - src = fetchFromGitHub { - owner = "yshui"; - repo = "compton"; - rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; - sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; - }; - - 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 = with maintainers; [ ertes enzime twey ]; - platforms = platforms.linux; - }; -} |