Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-03-18 13:35:59 +01:00
206 changed files with 3936 additions and 1371 deletions

View File

@@ -3,7 +3,7 @@
, lib
, pkg-config
, glib
, gnome2
, gtk2
, libticonv
, libtifiles2
, libticables2
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ];
buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
NIX_CFLAGS_COMPILE = [ "-lm" ];
meta = with lib; {
homepage = "http://lpg.ticalc.org/prj_tilem/";