diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-05-13 20:07:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-05-13 20:07:13 +0200 |
commit | 93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a (patch) | |
tree | 9f39e9358af3a7e392b41c1d5fb5d928150ee2bb /pkgs/applications/editors/codeblocks | |
parent | 9c8ee7a7e55259d1c351c8343e00c6db9353eca8 (diff) | |
download | nixlib-93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a.tar nixlib-93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a.tar.gz nixlib-93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a.tar.bz2 nixlib-93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a.tar.lz nixlib-93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a.tar.xz nixlib-93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a.tar.zst nixlib-93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a.zip |
codeblocks: fix eval on non-linux, minor refactoring
Diffstat (limited to 'pkgs/applications/editors/codeblocks')
-rw-r--r-- | pkgs/applications/editors/codeblocks/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 73e9189e63aa..1bf4bb1f8e6f 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk -, contribPlugins ? false, hunspell, gamin , boost +, contribPlugins ? false, hunspell, gamin, boost }: +with { inherit (stdenv.lib) optionalString optional optionals; }; + stdenv.mkDerivation rec { name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; version = "13.12"; @@ -13,13 +15,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ] - ++ stdenv.lib.optionals contribPlugins [ hunspell gamin boost ]; + ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; 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" ] - ++ stdenv.lib.optional contribPlugins "--with-contrib-plugins"; + ++ optional contribPlugins "--with-contrib-plugins"; meta = with stdenv.lib; { maintainers = [ maintainers.linquize ]; |