diff options
| author | aszlig <aszlig@nix.build> | 2021-06-15 22:42:59 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2021-06-15 22:57:30 +0200 |
| commit | 4701a995cb865c5d7178f574a3eae5872595e768 (patch) | |
| tree | e2d6de2d314ec61d275922a920dcb331e4f0217e /pkgs/aszlig | |
| parent | 50931e7473d7a2eb6ebb94b44277437518485281 (diff) | |
pkgs/psi: Replaced aliased use of html-tidy
A recent change[1] disabled aliases by default in VM tests and since libtidy actually has been an alias of html-tidy since 2014 it's a good idea to use the actual non-aliased packaged. Since I added my PSI build in 2019, I probably didn't check for whether the package name in nixpkgs would be different while packaging and only used the name as reported by CMake, thinking it would work (which it did). Disallowing aliases in VM tests however is a good change, so let's use the real package name. This should fix the evaluation of the Hydra jobset. [1]: https://github.com/NixOS/nixpkgs/commit/3edde6562e19698da69a499881e0a2e4f5a497a2 Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/aszlig')
| -rw-r--r-- | pkgs/aszlig/psi/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix index 17a85fc4..4efe4e70 100644 --- a/pkgs/aszlig/psi/default.nix +++ b/pkgs/aszlig/psi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, makeWrapper , hunspell, libgcrypt, libgpgerror, libidn, libotr, libsForQt5 -, libsignal-protocol-c, libtidy, qt5 +, libsignal-protocol-c, html-tidy, qt5 , substituteAll @@ -71,6 +71,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake makeWrapper qt5.wrapQtAppsHook ]; buildInputs = [ + html-tidy hunspell libgcrypt libgpgerror @@ -78,7 +79,6 @@ in stdenv.mkDerivation rec { libotr libsForQt5.qca-qt5 libsignal-protocol-c - libtidy usrsctp qt5.qtbase qt5.qtmultimedia |