diff options
| author | Tobias Mayer <tobim@fastmail.fm> | 2022-10-03 08:19:53 +0200 |
|---|---|---|
| committer | Tobias Mayer <tobim@fastmail.fm> | 2022-10-03 08:19:53 +0200 |
| commit | a0a570bf789c20cc1d7376248c8273500fad6e3a (patch) | |
| tree | e55d2759643540fe19ae4d47e74d0332ddeb7d8b | |
| parent | 978895272f8366f1a8545b26365ec0039b42ab5d (diff) | |
| download | nixpkgs-a0a570bf789c20cc1d7376248c8273500fad6e3a.tar nixpkgs-a0a570bf789c20cc1d7376248c8273500fad6e3a.tar.gz nixpkgs-a0a570bf789c20cc1d7376248c8273500fad6e3a.tar.bz2 nixpkgs-a0a570bf789c20cc1d7376248c8273500fad6e3a.tar.lz nixpkgs-a0a570bf789c20cc1d7376248c8273500fad6e3a.tar.xz nixpkgs-a0a570bf789c20cc1d7376248c8273500fad6e3a.tar.zst nixpkgs-a0a570bf789c20cc1d7376248c8273500fad6e3a.zip | |
pkgsStatic.lz4: fix build
| -rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index bf048eeb87d..579ee9b2094 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, valgrind +{ lib, stdenv, fetchFromGitHub, fetchpatch, valgrind , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { owner = pname; }; + patches = lib.optionals (!enableShared) [ + # This patch is already part of the `dev` branch. + # Remove when upgrading to the next version. + (fetchpatch { + name = "lz4-fix-BUILD_SHARED=no.patch"; + url = "https://github.com/lz4/lz4/commit/5ccbd38277989ae6a728171d59ae03bad6f2f4d5.patch"; + sha256 = "sha256-P+/uz3m7EAmHgXF/1Vncc0uKKxNVq6HNIsElx0rGxpw="; + }) + ]; + # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; |