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

Merge pull request #14154 from grahamc/codeblocks

Browse Source 
codeblocks: ad libX11 build dependency to fix 16.03 hydra build
This commit is contained in:
Domen Kožar 2016-03-23 15:42:28 +00:00
commit 0e6df91569
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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 , contribPlugins ? false, hunspell, gamin, boost, libX11
}: }:
with { inherit (stdenv.lib) optionalString optional optionals; }; with { inherit (stdenv.lib) optionalString optional optionals; };
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
}; };
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ] buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk libX11 ]
++ optionals contribPlugins [ hunspell gamin boost ]; ++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ ./writable-projects.patch ]; patches = [ ./writable-projects.patch ];