diff options
| author | Zane van Iperen <zane@zanevaniperen.com> | 2021-12-06 13:36:56 +1000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-12-16 10:03:26 +0000 |
| commit | 6626bc544d2d66d0c348de98ce9649e750b6477e (patch) | |
| tree | 9c69d1014ba9d652b9f56d8f7564e8a1d4fa7f21 | |
| parent | Merge pull request #150865 from LeSuisse/21.11-vault-1.8.6 (diff) | |
| download | nixpkgs-6626bc544d2d66d0c348de98ce9649e750b6477e.tar.gz | |
openrussian-cli: force lua 5.3origin/backport-148842-to-release-21.11
And some cleanups.
(cherry picked from commit 57e7a01eb362489d764af75806b469d69614b11b)
| -rw-r--r-- | pkgs/misc/openrussian-cli/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index ce9a9e49c4ca..24c0b6bece78 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { dontConfigure = true; - # Disable check as it's too slow. - # doCheck = true; - - #This is needed even though it's the default for some reason. - checkTarget = "check"; - # Can't use "make install" here installPhase = '' runHook preInstall diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13de9124e882..edc5491fecca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8227,7 +8227,9 @@ with pkgs; openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; - openrussian-cli = callPackage ../misc/openrussian-cli { }; + openrussian-cli = callPackage ../misc/openrussian-cli { + luaPackages = lua53Packages; + }; opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; |