From dde17cf4ec76f67cb4a08fec3a908459ecd32e7b Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 7 Feb 2021 21:00:09 +0100 Subject: [PATCH] pkgs: Add bang-evaluator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don’t know if (and doubt that) this is a good solution. I can’t simply callPackage it, since it does not use a callPackage compatible nix expression but rather a ready-to-build default.nix. Also, I need the source in two different files, one of which can’t use nixpkgs fetchers. --- pkgs/default.nix | 8 +++++++- pkgs/modules.nix | 5 +++++ pkgs/srcs.nix | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/srcs.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 17e59b2..04187f5 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,10 @@ -self: super: { +self: super: +let + srcs = import ./srcs.nix; +in +{ + bang-evaluator = import srcs.bang-evaluator { pkgs = self; }; + bwrap-helper = super.callPackage ./bwrap-helper { }; osu-lazer = super.callPackage ./osu-lazer { inherit (super) osu-lazer; }; diff --git a/pkgs/modules.nix b/pkgs/modules.nix index c6a74d6..1377afc 100644 --- a/pkgs/modules.nix +++ b/pkgs/modules.nix @@ -1,5 +1,10 @@ +{ pkgs, ... }: +let + srcs = import ./srcs.nix; +in { imports = [ ./wordclock-dimmer/module.nix + "${srcs.bang-evaluator}/module.nix" ]; } diff --git a/pkgs/srcs.nix b/pkgs/srcs.nix new file mode 100644 index 0000000..28ba550 --- /dev/null +++ b/pkgs/srcs.nix @@ -0,0 +1,6 @@ +{ + bang-evaluator = builtins.fetchTarball { + url = "https://git.sbruder.de/simon/bangs/archive/ca0d9ed47b21d7424a3b8be7bb55c55c62d17d3a.tar.gz"; + sha256 = "1dk5lrhfnyqq604ih584kdb9z3zg49rp9y6b0ai3g5i3f0lwcfw7"; + }; +}