diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/nheko/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2f5316c9fe27..80ffbebe9be3 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -17,6 +17,7 @@ , mtxclient , boost17x , spdlog +, fmt , olm , pkgconfig , nlohmann_json @@ -47,6 +48,7 @@ mkDerivation rec { boost17x lmdb spdlog + fmt cmark qtbase qtmultimedia diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 06053a8f356b..2247ece9fab7 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, llvmPackages ? null +, fmt, llvmPackages ? null }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog wrapQtAppsHook ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt wrapQtAppsHook ] ++ (with python3Packages; [ python pybind11 ]) ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; - meta = { + meta = with stdenv.lib { description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; homepage = "https://github.com/emsec/hal"; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ ris ]; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ris shamilton ]; }; } |