From 471759a242b0c7972c98be1f6e7ef922792d382c Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Mon, 31 Jul 2023 01:14:51 +0300 Subject: 2023-07-31 --- modules/common/common/nix/default.nix | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index 29db931..e516500 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -4,6 +4,7 @@ lib, localUsername ? lib.my.username, pkgs, + pkgsPr, this, ... }: @@ -83,13 +84,6 @@ with lib; { self.overlays.default (_: super: { - nix-bash-completions = super.nix-bash-completions.overrideAttrs (_: _: { - postPatch = '' - substituteInPlace _nix \ - --replace 'nix nixos-option' 'nixos-option' - ''; - }); - helm = with super; kubernetes-helm-wrapped.override { plugins = with kubernetes-helmPlugins; [helm-secrets]; @@ -103,21 +97,7 @@ with lib; { patches = final.patches ++ [./patches/tdesktop-no-ads.patch]; }); - openmw = super.openmw.overrideAttrs (_: final: { - src = super.fetchFromGitHub { - owner = "OpenMW"; - repo = "openmw"; - rev = "openmw-48-rc10"; - hash = "sha256-BIeCVM2O/YBgRjAedxe5/NqXpYeHggn3eSnHLgZtX80="; - }; - patches = []; - buildInputs = - final.buildInputs - ++ (with super; [ - yaml-cpp - luajit - ]); - }); + inherit (pkgsPr 245433 "sha256-7duAw2pGwXrX4cgUioNSypmuiNR/hCUVywhKL6jW3qE=") openmw; } // (let openconnect = super.openconnect.overrideAttrs (_: _: { -- cgit 1.4.1