Merge branch 'staging-next' into staging

2021-05-12 14:31:36 +02:00
parent 917218e8e2 1d2db66464
commit 71fa678899
37 changed files with 321 additions and 214 deletions
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];
+  nativeBuildInputs = [ pkg-config makeWrapper ];
+  buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];

  meta = with lib; {
    description = "An easy rich text processor";