uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl, wxGTK, util-linux, zlib }:
stdenv.mkDerivation rec {
pname = "comical";
version = "0.8";
src = fetchurl {
url = "mirror://sourceforge/comical/comical-${version}.tar.gz";
sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
};
buildInputs = [ wxGTK util-linux zlib ];
makeFlags = [ "prefix=${placeholder "out"}" ];
patches = [ ./wxgtk-2.8.patch ];
preInstall = "mkdir -pv $out/bin";
meta = {
description = "Viewer of CBR and CBZ files, often used to store scanned comics";
homepage = "http://comical.sourceforge.net/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux;
};
}

View file

@ -0,0 +1,36 @@
diff --git a/Makefile b/Makefile
index a648e72..181c47f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
CC = `wx-config --cxx`
-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
+LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
INSTALL = install
INSTALL_PROGRAM = $(INSTALL)
prefix = /usr/local
diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp
index 0c004cd..667e75e 100644
--- a/src/ComicalApp.cpp
+++ b/src/ComicalApp.cpp
@@ -28,6 +28,7 @@
#include "ComicalApp.h"
#include "ComicalFrame.h"
#include <wx/log.h>
+#include <wx/icon.h>
#if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
#include "../Comical Icons/comical.xpm"
diff --git a/unzip/unzip.h b/unzip/unzip.h
index b247937..5bb6a69 100644
--- a/unzip/unzip.h
+++ b/unzip/unzip.h
@@ -50,7 +50,7 @@ extern "C" {
#endif
#ifndef _ZLIB_H
-#include "zlib.h"
+#include <zlib.h>
#endif
#ifndef _ZLIBIOAPI_H