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

codeblocks: 13.12 -> 16.01

Browse Source 
(@7c6f434c) move the buildInputs missed in the initial version to
nativeBuildInputs, too.

Pushed instead of #24074
This commit is contained in:
ndowens 2017-03-19 15:40:11 -05:00 committed by Michael Raskin
parent 317734f99c
commit bc4dc9cb75
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,23 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2 { stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2
, contribPlugins ? false, hunspell, gamin, boost , contribPlugins ? false, hunspell, gamin, boost
}: }:
with stdenv.lib;
with { inherit (stdenv.lib) optionalString optional optionals; }; with { inherit (stdenv.lib) optionalString optional optionals; };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
version = "13.12"; version = "16.01";
pname = "codeblocks"; pname = "codeblocks";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz"; url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz";
sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh";
}; };
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ] nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ];
buildInputs = [ wxGTK gtk2 ]
++ optionals contribPlugins [ hunspell gamin boost ]; ++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ ./writable-projects.patch ]; patches = [ ./writable-projects.patch ];
@ -25,9 +28,9 @@ stdenv.mkDerivation rec {
# 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";
meta = with stdenv.lib; { meta = {
maintainers = [ maintainers.linquize ]; maintainers = [ maintainers.linquize ];
platforms = platforms.all; platforms = platforms.all;
description = "The open source, cross platform, free C, C++ and Fortran IDE"; description = "The open source, cross platform, free C, C++ and Fortran IDE";