diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 5c436307897f..cca5d06ba90a 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,8 +1,6 @@ { lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let - macvim = callPackage ./macvim.nix { inherit stdenv; }; - makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } @@ -62,5 +60,4 @@ let override = f: makeCustomizable (macvim.override f); overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f); }; -in - makeCustomizable macvim +in { inherit makeCustomizable; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84826faa30c9..4bcc633480b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35086,7 +35086,11 @@ with pkgs; vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; - macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; + macvim = let + macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { }; + in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix { + stdenv = clangStdenv; + }); vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;