libofa: fix patch application
Without the change patches fail to apply as `$patches` contain compressed
tarball:
applying patch /nix/store/yrl3bq4ag3787yq32zawxnd6nsyk4a8r-libofa_0.9.3-5.debian.tar.gz
(Stripping trailing CRs from patch; use --binary to disable.)
patching file lib/signal_op.cpp
(Stripping trailing CRs from patch; use --binary to disable.)
patching file examples/example.cpp
(Stripping trailing CRs from patch; use --binary to disable.)
With `patch-2.8` it will become an error.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
expat,
|
||||
curl,
|
||||
fftw,
|
||||
@@ -17,11 +18,22 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
|
||||
};
|
||||
|
||||
patches = fetchurl {
|
||||
debian_patches = fetchzip {
|
||||
url = "mirror://debian/pool/main/libo/libofa/libofa_${version}-${deb_patch}.debian.tar.gz";
|
||||
sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn";
|
||||
hash = "sha256-tENhXSRcUP1PKm35IJyLUEEROze8UzxJzRx3VNAqo40=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
"${debian_patches}/patches/01_gcc41.diff"
|
||||
"${debian_patches}/patches/02_example-open.diff"
|
||||
"${debian_patches}/patches/03_example-size_type.diff"
|
||||
"${debian_patches}/patches/04_libofa.pc-deps.diff"
|
||||
"${debian_patches}/patches/05_gcc43.diff"
|
||||
"${debian_patches}/patches/06_gcc44.diff"
|
||||
"${debian_patches}/patches/fix_ftbfs.diff"
|
||||
"${debian_patches}/patches/fix-ftbfs-gcc4.7.diff"
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
|
||||
Reference in New Issue
Block a user