public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mailcore2: remove git conflict line, still doesn't build

Browse Source
This commit is contained in:
Domen Kožar 2016-05-17 13:07:22 +01:00
parent b49bf121b8
commit 00ead3178b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/mailcore2/default.nix
View File

@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
--replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
--replace buffio.h tidybuffio.h --replace buffio.h tidybuffio.h
>>>>>>> master
''; '';
cmakeFlags = [ cmakeFlags = [