emacsPackages: fix build for nongnu packages (e48a0365) · Commits · nix / nixpkgs

pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix

+18 −1

Original line number	Diff line number	Diff line
		pkgs:
		pkgs: lib:

		self: super:

		let
		inherit (import ./lib-override-helper.nix pkgs lib)
		addPackageRequires
		;
		in
		{
		# missing optional dependencies
		haskell-tng-mode = addPackageRequires super.haskell-tng-mode (
		with self;
		[
		s
		company
		projectile
		smartparens
		yasnippet
		]
		);

		p4-16-mode = super.p4-16-mode.overrideAttrs {
		# workaround https://github.com/NixOS/nixpkgs/issues/301795
		prePatch = ''

+12 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@
		self:
		let

		inherit (import ./lib-override-helper.nix pkgs lib)
		addPackageRequires
		;

		generateNongnu = lib.makeOverridable (
		{
		generated ? ./nongnu-devel-generated.nix,
		@@ -39,9 +43,15 @@ let

		super = imported;

		commonOverrides = import ./nongnu-common-overrides.nix pkgs;
		commonOverrides = import ./nongnu-common-overrides.nix pkgs lib;

		overrides = self: super: { };
		overrides = self: super: {
		# missing optional dependencies
		haskell-tng-mode = addPackageRequires super.haskell-tng-mode [
		self.shut-up
		self.lsp-mode
		];
		};

		in
		let

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ self: let

		super = imported;

		commonOverrides = import ./nongnu-common-overrides.nix pkgs;
		commonOverrides = import ./nongnu-common-overrides.nix pkgs lib;

		overrides = self: super: { };