diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2016-05-06 20:50:52 -0400 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2016-05-06 22:32:23 -0400 |
commit | ec1c8071b1a44c623aa83a3edcaf71562957290b (patch) | |
tree | 1bdd5cdec6f43303200e3c8e1d081ccab25ffb0b | |
parent | c083ef0c6d67bb419a4c8949ab18c5823b3881b6 (diff) | |
download | nixlib-ec1c8071b1a44c623aa83a3edcaf71562957290b.tar nixlib-ec1c8071b1a44c623aa83a3edcaf71562957290b.tar.gz nixlib-ec1c8071b1a44c623aa83a3edcaf71562957290b.tar.bz2 nixlib-ec1c8071b1a44c623aa83a3edcaf71562957290b.tar.lz nixlib-ec1c8071b1a44c623aa83a3edcaf71562957290b.tar.xz nixlib-ec1c8071b1a44c623aa83a3edcaf71562957290b.tar.zst nixlib-ec1c8071b1a44c623aa83a3edcaf71562957290b.zip |
macvim: fix build
-rw-r--r-- | pkgs/applications/editors/vim/macvim.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 6f43a2f9a897..a688170b8ad4 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, ncurses, gettext , pkgconfig, cscope, python, ruby, tcl, perl, luajit +, darwin }: stdenv.mkDerivation rec { @@ -72,6 +73,10 @@ stdenv.mkDerivation rec { ) ''; + postConfigure = '' + substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" + ''; + postInstall = '' mkdir -p $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98aee99dda64..c0b784cc329c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14263,7 +14263,7 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; + macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; ruby = ruby_2_2; }; vimHugeX = vim_configurable; |