From 4e9ddd37703d8807d8f68cd949d83be22df9cdaf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 27 Mar 2016 20:54:35 +0300 Subject: [PATCH] Revert "codeblocks: fix build" This reverts commit fd9416fb4b517ceb8a6af6184204d585f6e02c9f. This shouldn't be needed now that we properly link wxGTK. --- pkgs/applications/editors/codeblocks/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index f11a8b5cc3a3..53b7b5750a04 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, libX11, cairo +, contribPlugins ? false, hunspell, gamin, boost }: with { inherit (stdenv.lib) optionalString optional optionals; }; @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; }; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - - buildInputs = [ file zip wxGTK gtk libX11 cairo ] + buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; @@ -25,9 +23,6 @@ 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";