ebook2cw: fix darwin build (#122801)

This commit is contained in:
Stéphan Kochen 2021-05-17 18:10:42 +02:00 committed by GitHub
parent cb8463cc69
commit 04e409b150
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 17 deletions

View file

@ -1,12 +0,0 @@
diff --git a/Makefile b/Makefile
index 005d60d..f69c7fe 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ install:
install -d -v $(DESTDIR)/bin/
install -d -v $(DESTDIR)/share/doc/ebook2cw/
install -d -v $(DESTDIR)/share/doc/ebook2cw/examples/
+ install -d -v $(DESTDIR)/share/locale/de/LC_MESSAGES/
install -s -m 0755 ebook2cw $(DESTDIR)/bin/
install -m 0644 ebook2cw.1 $(DESTDIR)/share/man/man1/
install -m 0644 README $(DESTDIR)/share/doc/ebook2cw/

View file

@ -1,18 +1,24 @@
{ lib, stdenv, fetchgit, lame, libvorbis, gettext }:
{ lib, stdenv, fetchgit, fetchpatch, lame, libvorbis, gettext }:
stdenv.mkDerivation rec {
pname = "ebook2cw";
version = "0.8.3";
version = "0.8.4";
src = fetchgit {
url = "https://git.fkurz.net/dj1yfk/ebook2cw.git";
rev = "${pname}-${version}";
sha256 = "0jqmnjblv3wzr0ppqzndzd8wg02nlkvzg1fqw14vyyp76sdjsh46";
sha256 = "0h7lg59m3dcydzkc8szipnwzag8fqwwvppa9fspn5xqd4blpcjd5";
};
buildInputs = [ lame libvorbis gettext ];
patches = [
# Fixes non-GCC compilers and a missing directory in the install phase.
(fetchpatch {
url = "https://git.fkurz.net/dj1yfk/ebook2cw/commit/eb5742e70b042cf98a04440395c34390b171c035.patch";
sha256 = "1m5f819cj3fj1piss0a5ciib3jqrqdc14lp3i3dszw4bg9v1pgyd";
})
];
patches = [ ./Makefile.patch ];
buildInputs = [ lame libvorbis gettext ];
makeFlags = [ "DESTDIR=$(out)" ];