nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

macvim: fix overrides

Browse Source 
Previously, attemping to override macvim would override the
`macvim-configurable.nix` definition instead of overriding the macvim
package.
This commit is contained in:
Lily Ballard 2023-09-13 13:25:16 -07:00 committed by Lily Ballard
parent 5a7646f590
commit 7eb3f2778d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/editors/vim/macvim-configurable.nix
View File

@ -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; }

6
pkgs/top-level/all-packages.nix
View File

@ -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;