summaryrefslogtreecommitdiff
path: root/modules/common
diff options
context:
space:
mode:
authorAzat Bahawi <azat@bahawi.net>2023-07-31 01:14:51 +0300
committerAzat Bahawi <azat@bahawi.net>2023-07-31 01:14:51 +0300
commit471759a242b0c7972c98be1f6e7ef922792d382c (patch)
tree993d1c5736f660f6dae20429fe1b2c5ad61c8ad8 /modules/common
parent20b19dbf8fd2a338143d7cd4a0dc036848be80a6 (diff)
2023-07-31
Diffstat (limited to 'modules/common')
-rw-r--r--modules/common/common/nix/default.nix24
1 files 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 (_: _: {