From fd9416fb4b517ceb8a6af6184204d585f6e02c9f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 27 Mar 2016 03:20:05 +0200
Subject: [PATCH] codeblocks: fix build

https://hydra.nixos.org/build/33633573/nixlog/1/raw
---
 pkgs/applications/editors/codeblocks/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 53b7b5750a0..f11a8b5cc3a 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -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";