diff options
author | Shawn8901 <shawn8901@googlemail.com> | 2023-01-21 23:06:40 +0100 |
---|---|---|
committer | Shawn8901 <shawn8901@googlemail.com> | 2023-01-21 23:11:12 +0100 |
commit | 3866fa44a7f9fae7c83e53e7eea295e1f9212055 (patch) | |
tree | 516a1bc6c163a49132c65fb1a193757b103706b4 /pkgs/applications/editors/codeblocks/default.nix | |
parent | 66ed9c811ea3f2a49443b8788b07244d9d982348 (diff) |
treewide: remove global with lib; in pkgs/{audio,blockchain,editors}
Diffstat (limited to 'pkgs/applications/editors/codeblocks/default.nix')
-rw-r--r-- | pkgs/applications/editors/codeblocks/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 7a1c0af2c6430..441b224ef0226 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -2,8 +2,6 @@ , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: -with lib; - stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; version = "20.03"; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; buildInputs = [ wxGTK31 gtk3 ] - ++ optionals contribPlugins [ hunspell gamin boost ]; + ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch @@ -56,16 +54,16 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; - configureFlags = [ "--enable-pch=no" ] ++ optionals contribPlugins [ - ("--with-contrib-plugins" + optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ + ("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; - meta = { + meta = with lib; { maintainers = [ maintainers.linquize ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; |