diff options
Diffstat (limited to 'pkgs/applications/editors/jucipp/default.nix')
-rw-r--r-- | pkgs/applications/editors/jucipp/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 53549986ed241..5f2cf75ff3737 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, +{ lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "juicipp"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { lintIncludes = let p = "arguments.emplace_back(\"-I"; e = "\");"; - v = stdenv.lib.getVersion llvmPackages.clang; + v = lib.getVersion llvmPackages.clang; in p+llvmPackages.libcxx+"/include/c++/v1"+e +p+llvmPackages.clang-unwrapped+"/lib/clang/"+v+"/include/"+e @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc ''; - cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; + cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; postInstall = '' mv $out/bin/juci $out/bin/.juci makeWrapper "$out/bin/.juci" "$out/bin/juci" \ - --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ + --set PATH "${lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ --set NO_AT_BRIDGE 1 \ --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" ''; |