forked from mirrors/nixpkgs
mailcore2: remove git conflict line, still doesn't build
This commit is contained in:
parent
b49bf121b8
commit
00ead3178b
|
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
|
|||
--replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
|
||||
substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
|
||||
--replace buffio.h tidybuffio.h
|
||||
>>>>>>> master
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
Loading…
Reference in a new issue