diff options
author | Sebastián Mancilla <smancill@smancill.dev> | 2021-11-19 16:33:14 -0300 |
---|---|---|
committer | Sebastián Mancilla <smancill@smancill.dev> | 2021-11-19 21:00:57 -0300 |
commit | 5c35e9184db774816bbd2de4a996f74a6583153b (patch) | |
tree | 47dcb2e627b8477dad449d69130928c9089a2fb5 /pkgs/tools/compression | |
parent | b663e1b4d3b996457b9915d3156a41e3649f16f6 (diff) | |
download | nixpkgs-5c35e9184db774816bbd2de4a996f74a6583153b.tar nixpkgs-5c35e9184db774816bbd2de4a996f74a6583153b.tar.gz nixpkgs-5c35e9184db774816bbd2de4a996f74a6583153b.tar.bz2 nixpkgs-5c35e9184db774816bbd2de4a996f74a6583153b.tar.lz nixpkgs-5c35e9184db774816bbd2de4a996f74a6583153b.tar.xz nixpkgs-5c35e9184db774816bbd2de4a996f74a6583153b.tar.zst nixpkgs-5c35e9184db774816bbd2de4a996f74a6583153b.zip |
lrzip: enable asm on x86 and fix build on darwin
Enable compilation of native assembly code on x86 systems, instead of disabling it for all systems. On darwin ensure the format is set to macho64. The ASM/x86 directory is compiled whether "--enable-asm" is configured or not, but it creates an empty archive, which fails on darwin, so ensure it is not compiled on darwin to fix the build.
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r-- | pkgs/tools/compression/lrzip/default.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 4223aa656e1..4fe5512b4c6 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, lzo, bzip2, lz4, nasm, perl }: +let + inherit (stdenv.hostPlatform) isx86; +in stdenv.mkDerivation rec { pname = "lrzip"; version = "0.641"; @@ -11,11 +14,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-253CH6TiHWyr13C76y9PXjyB7gj2Bhd2VRgJ5r+cm/g="; }; - nativeBuildInputs = [ autoreconfHook nasm perl ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # Building the ASM/x86 directory creates an empty archive, + # which fails on darwin, so remove it + # https://github.com/ckolivas/lrzip/issues/193 + # https://github.com/Homebrew/homebrew-core/pull/85360 + substituteInPlace lzma/Makefile.am --replace "SUBDIRS = C ASM/x86" "SUBDIRS = C" + substituteInPlace configure.ac --replace "-f elf64" "-f macho64" + ''; + + nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals isx86 [ nasm ]; buildInputs = [ zlib lzo bzip2 lz4 ]; - configureFlags = [ + configureFlags = lib.optionals (!isx86) [ "--disable-asm" ]; |