diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-05 18:01:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 18:01:13 +0000 |
| commit | 2579984b855b4ca3abf97f5b023d783195ef06e3 (patch) | |
| tree | 295736073d81a26b9469ad7128b1201585fd9088 /pkgs/tools/compression | |
| parent | 5f4d3d57a7501ac34cbe9098cbe27e73d5f99810 (diff) | |
| parent | 7072592b623274504d212076d88a288b587f04d5 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/lzip/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/compression/lzip/mingw-install-exe-file.patch | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 526e3f8c12fc3..4c2d678eefde2 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-R5LAR93xXvKdVbqOaKGiHgy3aS2H7N9yBEGYZFgvKA0="; }; + patches = lib.optionals stdenv.hostPlatform.isMinGW [ + ./mingw-install-exe-file.patch + ]; + configureFlags = [ "CPPFLAGS=-DNDEBUG" "CFLAGS=-O3" diff --git a/pkgs/tools/compression/lzip/mingw-install-exe-file.patch b/pkgs/tools/compression/lzip/mingw-install-exe-file.patch new file mode 100644 index 0000000000000..b2b4b2be067e0 --- /dev/null +++ b/pkgs/tools/compression/lzip/mingw-install-exe-file.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index d07ad5a..1c15203 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -64,7 +64,7 @@ install-strip-compress : install-bin-strip install-info-compress install-man-com + + install-bin : all + if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi +- $(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)" ++ $(INSTALL_PROGRAM) ./$(progname).exe "$(DESTDIR)$(bindir)/$(progname).exe" + + install-bin-strip : all + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-bin |