From 93d081c3bc7422d9520c9f55ec528ba1e935f2f3 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 13 Jan 2020 21:49:25 +0100 Subject: [PATCH] Add htop overlay --- modules/nixpkgs.nix | 2 ++ overlays/default.nix | 5 +++++ overlays/htop.nix | 18 ++++++++++++++++++ overlays/lib/nixpkgs.nix | 17 +++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 overlays/default.nix create mode 100644 overlays/htop.nix create mode 100644 overlays/lib/nixpkgs.nix diff --git a/modules/nixpkgs.nix b/modules/nixpkgs.nix index f9a127e..233ec63 100644 --- a/modules/nixpkgs.nix +++ b/modules/nixpkgs.nix @@ -166,5 +166,7 @@ in _module.args.pkgs = _pkgs; + nixpkgs.overlays = import ../overlays; + }; } diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..66f4fc6 --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,5 @@ +# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. + +[ + (import ./htop.nix) +] diff --git a/overlays/htop.nix b/overlays/htop.nix new file mode 100644 index 0000000..960600b --- /dev/null +++ b/overlays/htop.nix @@ -0,0 +1,18 @@ +# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. + +self: super: + +let + nixpkgs = import ./lib/nixpkgs.nix { inherit super; }; +in + +{ + htop = nixpkgs.htop.overrideAttrs (old: { + patches = [ + (super.fetchpatch { + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/htop/fix-missing-macros.patch"; + sha256 = "1cljkjagp66xxcjb6y1m9k4v994slfkd0s6fijh02l3rp8ycvjnv"; + }) + ]; + }); +} diff --git a/overlays/lib/nixpkgs.nix b/overlays/lib/nixpkgs.nix new file mode 100644 index 0000000..e8ec808 --- /dev/null +++ b/overlays/lib/nixpkgs.nix @@ -0,0 +1,17 @@ +# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. + +{ super }: + +let + pinnedPkgsSrc = super.fetchFromGitHub { + owner = "NixOS"; + repo = "nixpkgs"; + rev = "7e8454fb856573967a70f61116e15f879f2e3f6a"; + sha256 = "0lnbjjvj0ivpi9pxar0fyk8ggybxv70c5s0hpsqf5d71lzdpxpj8"; + }; +in + +import pinnedPkgsSrc { + inherit (super) config; + overlays = [ ]; +}