diff options
author | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:01 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:21 +0000 |
commit | 32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b (patch) | |
tree | fcc3746d350ac20ff693adb7c40f945274e4d2f6 /pkgs/applications/window-managers | |
parent | aabb651b23969ea4c901914db6ca34eb2897f7a0 (diff) | |
parent | b5d1d50aa90e0780c57fb4b323203ea5056be857 (diff) |
Merge master into staging
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/compton/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index e729f786a5663..843c331f91cdc 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 +{ stdenv, lib, fetchFromGitHub, pkgconfig, 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 , libXinerama, libXext, xwininfo, libxdg_basedir }: stdenv.mkDerivation rec { pname = "compton"; - version = "6.2"; + version = "7"; COMPTON_VERSION = "v${version}"; @@ -13,12 +13,14 @@ stdenv.mkDerivation rec { owner = "yshui"; repo = "compton"; rev = COMPTON_VERSION; - sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7"; + sha256 = "0f23dv2p1snlpzc91v38q6896ncz4zqzmh2d97yf66j78g21awas"; + fetchSubmodules = true; }; nativeBuildInputs = [ meson ninja pkgconfig + uthash asciidoc docbook_xml_dtd_45 docbook_xsl @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - git() { echo "v${version}"; } + git() { echo "$COMPTON_VERSION"; } export -f git ''; |