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

Revert "codeblocks: fix build"

Browse Source 
This reverts commit fd9416fb4b517ceb8a6af6184204d585f6e02c9f.

This shouldn't be needed now that we properly link wxGTK.
This commit is contained in:
Nikolay Amiantov 2016-03-27 20:54:35 +03:00
parent 5471eed63c
commit 4e9ddd3770
1 changed files with 2 additions and 7 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 { 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; }; with { inherit (stdenv.lib) optionalString optional optionals; };
@ -14,9 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
}; };
nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
buildInputs = [ file zip wxGTK gtk libX11 cairo ]
++ optionals contribPlugins [ hunspell gamin boost ]; ++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ ./writable-projects.patch ]; patches = [ ./writable-projects.patch ];
@ -25,9 +23,6 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-pch=no" ] configureFlags = [ "--enable-pch=no" ]
++ optional contribPlugins "--with-contrib-plugins"; ++ 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 # Fix boost 1.59 compat
# Try removing in the next version # Try removing in the next version
CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";