From b924f67103dc0f861a86020288d78de335be1ee8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 2 May 2019 13:42:25 +0200 Subject: [PATCH] Try to fix pkgs for NUR inclusion --- pkgs/default.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 3c09e30..409d028 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,31 +1,33 @@ { pkgs }: with pkgs; +let mylibs = import ../libs.nix { inherit pkgs; }; +in { boinctui = callPackage ../pkgs/boinctui {}; - cnagios = callPackage ../pkgs/cnagios {}; + cnagios = callPackage ../pkgs/cnagios { inherit mylibs; }; duply = callPackage ../pkgs/duply {}; - flrn = callPackage ../pkgs/flrn { slang = callPackage ../pkgs/slang_1 {}; }; + flrn = callPackage ../pkgs/flrn { inherit mylibs; slang = callPackage ../pkgs/slang_1 {}; }; genius = callPackage ../pkgs/genius {}; mtop = callPackage ../pkgs/mtop {}; muttprint = callPackage ../pkgs/muttprint {}; - mutt-ics = callPackage ../pkgs/mutt-ics {}; - nagios-cli = callPackage ../pkgs/nagios-cli {}; - nagnu = callPackage ../pkgs/nagnu {}; + mutt-ics = callPackage ../pkgs/mutt-ics { inherit mylibs; }; + nagios-cli = callPackage ../pkgs/nagios-cli { inherit mylibs; }; + nagnu = callPackage ../pkgs/nagnu { inherit mylibs; }; note = callPackage ../pkgs/note {}; notmuch-python2 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; }; notmuch-python3 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; }; notmuch-vim = callPackage ../pkgs/notmuch/notmuch-vim {}; - pg_activity = callPackage ../pkgs/pg_activity {}; - pgloader = callPackage ../pkgs/pgloader {}; - telegram-cli = callPackage ../pkgs/telegram-cli {}; - telegram-history-dump = callPackage ../pkgs/telegram-history-dump {}; - telegramircd = callPackage ../pkgs/telegramircd { telethon = callPackage ../pkgs/telethon_sync {}; }; + pg_activity = callPackage ../pkgs/pg_activity { inherit mylibs; }; + pgloader = callPackage ../pkgs/pgloader { inherit mylibs; }; + telegram-cli = callPackage ../pkgs/telegram-cli { inherit mylibs; }; + telegram-history-dump = callPackage ../pkgs/telegram-history-dump { inherit mylibs; }; + telegramircd = callPackage ../pkgs/telegramircd { inherit mylibs; telethon = callPackage ../pkgs/telethon_sync {}; }; terminal-velocity = callPackage ../pkgs/terminal-velocity {}; tiv = callPackage ../pkgs/tiv {}; unicodeDoc = callPackage ../pkgs/unicode {}; - cardano = callPackage ../pkgs/crypto/cardano {}; - iota-cli-app = callPackage ../pkgs/crypto/iota-cli-app {}; + cardano = callPackage ../pkgs/crypto/cardano { inherit mylibs; }; + iota-cli-app = callPackage ../pkgs/crypto/iota-cli-app { inherit mylibs; }; sia = callPackage ../pkgs/crypto/sia {}; pure-ftpd = callPackage ../pkgs/pure-ftpd {}; -- 2.41.0