forked from mirrors/nixpkgs
codeblocks: fix eval on non-linux, minor refactoring
This commit is contained in:
parent
9c8ee7a7e5
commit
93e65a4d53
|
@ -2,6 +2,8 @@
|
||||||
, contribPlugins ? false, hunspell, gamin, boost
|
, contribPlugins ? false, hunspell, gamin, boost
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
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 = "13.12";
|
||||||
|
@ -13,13 +15,13 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
|
buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
|
||||||
++ stdenv.lib.optionals contribPlugins [ hunspell gamin boost ];
|
++ optionals contribPlugins [ hunspell gamin boost ];
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
patches = [ ./writable-projects.patch ];
|
patches = [ ./writable-projects.patch ];
|
||||||
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
||||||
postConfigure = "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig";
|
postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig";
|
||||||
configureFlags = [ "--enable-pch=no" ]
|
configureFlags = [ "--enable-pch=no" ]
|
||||||
++ stdenv.lib.optional contribPlugins "--with-contrib-plugins";
|
++ optional contribPlugins "--with-contrib-plugins";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
maintainers = [ maintainers.linquize ];
|
maintainers = [ maintainers.linquize ];
|
||||||
|
|
Loading…
Reference in a new issue