Merge branch 'master' into staging-next

2021-03-18 13:35:59 +01:00
parent c31077a602 de4012ac80
commit 0136206b12
206 changed files with 3936 additions and 1371 deletions
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
-fftw, gsl, goffice, libgsf }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
+, fftw, gsl, goffice, libgsf }:

 stdenv.mkDerivation rec {
  pname = "nip2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  buildInputs =
  [ pkg-config glib libxml2 flex bison vips
-    gnome2.gtk fftw gsl goffice libgsf
+    gtk2 fftw gsl goffice libgsf
  ];

  meta = with lib; {