From 09aa1485b1770c520c47e66fe54cfb1315b93e2d Mon Sep 17 00:00:00 2001 From: LeMarsu Date: Tue, 28 May 2024 22:12:26 +0200 Subject: [PATCH] fix: remove namePrefix and nameSuffix Was a stupid feature, and it just didn't work... --- lib/mkNeovimPkg.nix | 6 +----- lib/types.nix | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/mkNeovimPkg.nix b/lib/mkNeovimPkg.nix index f6d13ff..4cdc86e 100644 --- a/lib/mkNeovimPkg.nix +++ b/lib/mkNeovimPkg.nix @@ -4,8 +4,6 @@ }: { pkgs, package ? pkgs.neovim-unwrapped, - namePrefix ? "", - nameSuffix ? "", dependencies ? [], dependenciesExtraArgs ? {}, runtime ? {}, @@ -38,7 +36,5 @@ } // {luaRcContent = customRC;}; pkg = pkgs.wrapNeovimUnstable package (removeAttrs neovimConfig ["manifestRc" "neovimRcContent"]); - # TODO nameSuffix is buggy :'( - name = "${namePrefix}${pkg.name}${nameSuffix}"; in - builtins.seq (types.mkNeovimPkgOptions config) pkg // {inherit name;} + builtins.seq (types.mkNeovimPkgOptions config) pkg diff --git a/lib/types.nix b/lib/types.nix index 50bdbbb..1e25622 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -77,12 +77,6 @@ # Default is pkgs.neovim-unwrapped package = option drv; - # The prefix to add to the name of the package - namePrefix = option string; - - # The suffix to add to the name of the package - nameSuffix = option string; - # An array of dependencies. dependencies = list dependency;