Merge master into staging-next

2020-02-09 11:00:29 +01:00
parent 03755ed59a fec3dd2459
commit 531a48ebdb
60 changed files with 642 additions and 219 deletions
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [glib];

-  # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
-  dontDisableStatic = true;
+  NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;

  configureFlags = [
    "--x-includes=${libX11.dev}/include"