Merge remote-tracking branch 'upstream/gcc-8' into staging-next

Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
This commit is contained in:
Frederik Rietdijk
2019-09-08 20:44:26 +02:00
70 changed files with 275 additions and 659 deletions
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } :
let
version = "1.3.0";
version = "1.3.1";
in
stdenv.mkDerivation rec {
pname = "telegram-purple";
@@ -9,10 +9,12 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://github.com/majn/telegram-purple";
rev = "0340e4f14b2480782db4e5b9242103810227c522";
sha256 = "1xb7hrgisbpx00dsrm5yz934bdd7nfzicd7k855iynk3hjzqj7k5";
rev = "v${version}";
sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin libwebp libgcrypt gettext ];