diff options
author | ndowens <ndowens04@gmail.com> | 2017-03-19 15:40:11 -0500 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2017-03-24 17:49:30 +0100 |
commit | bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d (patch) | |
tree | 3737a5add7d2b87e6614372ea33db9e4ee487f3c /pkgs/applications/editors/codeblocks | |
parent | 317734f99cc095c0158e071ccb3052fa91407723 (diff) | |
download | nixpkgs-bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d.tar nixpkgs-bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d.tar.gz nixpkgs-bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d.tar.bz2 nixpkgs-bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d.tar.lz nixpkgs-bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d.tar.xz nixpkgs-bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d.tar.zst nixpkgs-bc4dc9cb7557e2ae4326fcfec434a486ae34fa0d.zip |
codeblocks: 13.12 -> 16.01
(@7c6f434c) move the buildInputs missed in the initial version to nativeBuildInputs, too. Pushed instead of #24074
Diffstat (limited to 'pkgs/applications/editors/codeblocks')
-rw-r--r-- | pkgs/applications/editors/codeblocks/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 9cab87e9ed2..8ee08f57655 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -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 }: +with stdenv.lib; + with { inherit (stdenv.lib) optionalString optional optionals; }; stdenv.mkDerivation rec { name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; - version = "13.12"; + version = "16.01"; pname = "codeblocks"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz"; - sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz"; + 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 ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; @@ -25,9 +28,9 @@ stdenv.mkDerivation rec { # Fix boost 1.59 compat # 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 ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; |