Commit 7eb3f277 authored by Lily Ballard's avatar Lily Ballard Committed by Lily Ballard
Browse files

macvim: fix overrides 

Previously, attemping to override macvim would override the
`macvim-configurable.nix` definition instead of overriding the macvim
package.
parent 5a7646f5

pkgs/applications/editors/vim/macvim-configurable.nix

+1 −4
Original line number Diff line number Diff line 
{ 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; }

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -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;