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

Merge pull request #14238 from joachifm/fix-codeblocks-for-staging

Browse Source 
codeblocks: fix build
This commit is contained in:
joachifm 2016-03-27 08:25:06 +00:00
commit dae3a7b721
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/editors/codeblocks/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk
, contribPlugins ? false, hunspell, gamin, boost
, contribPlugins ? false, hunspell, gamin, boost, libX11, cairo
}:
with { inherit (stdenv.lib) optionalString optional optionals; };
@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
};
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ file zip wxGTK gtk libX11 cairo ]
++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true;
patches = [ ./writable-projects.patch ];
@ -23,6 +25,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-pch=no" ]
++ optional contribPlugins "--with-contrib-plugins";
# for whatever reason, the build config does not set these flag ...
NIX_CFLAGS_COMPILE = "-lX11 -lcairo";
# Fix boost 1.59 compat
# Try removing in the next version
CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";