From c217d67be3f0919bf471143d8b7c37a2ede970bc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 6 Dec 2018 02:10:30 -0500 Subject: [PATCH] mozlz4a: replace lz4 alias with proper name lz4 used to package the same package as python-lz4, then lz4 was removed and became an alias to python-lz4 --- pkgs/tools/compression/mozlz4a/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index abd09483666..ce2aa9520d6 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, python3, pylz4}: +{ stdenv, fetchurl, python3 }: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "mozlz4a"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/mozlz4a" ''; - buildInputs = [ pylz4 python3 ]; + buildInputs = [ python3 python3.pkgs.python-lz4 ]; meta = { inherit version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3650e3bcb85..962f2ed3455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1693,9 +1693,7 @@ in mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; - mozlz4a = callPackage ../tools/compression/mozlz4a { - pylz4 = python3Packages.lz4; - }; + mozlz4a = callPackage ../tools/compression/mozlz4a { }; msr-tools = callPackage ../os-specific/linux/msr-tools { };