From ca799c5187f6eaded69505ee88fee1593a74a9b7 Mon Sep 17 00:00:00 2001 From: Dhruv Dang Date: Fri, 24 May 2019 10:51:59 -0700 Subject: [PATCH] vim_configurable: build against gtk{2,3}-x11 instead of gtk{2,3} to fix builds on darwin --- pkgs/applications/editors/vim/configurable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3b75d08787e..9fdbdba8e18 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc { source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby +, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -130,8 +130,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 - ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional pythonSupport python