Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d504b3a1c20
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b60ebd7bd284
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 28, 2020

  1. zstd: Fix MinGW build

    @Ericson2314
    Ericson2314 committed Oct 28, 2020
    Copy the full SHA
    437dc4c View commit details

Commits on Oct 29, 2020

  1. libarchive: Fix Windows build

    @Ericson2314
    Ericson2314 committed Oct 29, 2020
    Copy the full SHA
    9f05c50 View commit details

  2. Merge remote-tracking branch 'windows/libarchive-windows' into libarc… 

    …hive-windows-29.09
    @Ericson2314
    Ericson2314 committed Oct 29, 2020
    Copy the full SHA
    52d0a80 View commit details

  3. Merge pull request #102070 from nix-windows/libarchive-windows-29.09 

    [20.09] libarchive: Fix MinGW build
    @Ericson2314
    Ericson2314 authored Oct 29, 2020
    Copy the full SHA
    b60ebd7 View commit details
Showing with 11 additions and 5 deletions.
  1. +7 −3 pkgs/development/libraries/libarchive/default.nix
  2. +4 −2 pkgs/tools/compression/zstd/default.nix
10 changes: 7 additions & 3 deletions pkgs/development/libraries/libarchive/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,10 @@
fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,

# Optional but increases closure only negligibly.
xarSupport ? true,
# Optional but increases closure only negligibly. Also, while libxml2
# builds fine on windows, but libarchive has trouble linking windows
# things it depends on for some reason.
xarSupport ? stdenv.hostPlatform.isUnix,
}:

assert xarSupport -> libxml2 != null;
@@ -22,7 +24,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];

nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ]
buildInputs =
stdenv.lib.optional stdenv.hostPlatform.isUnix sharutils
++ [ zlib bzip2 openssl xz lzo zstd ]
++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
++ stdenv.lib.optional xarSupport libxml2;

6 changes: 4 additions & 2 deletions pkgs/tools/compression/zstd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ bash ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash;

patches = [
./playtests-darwin.patch
@@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
--replace "zstdcat" "$bin/bin/zstdcat"
'';

outputs = [ "bin" "dev" "man" "out" ];
outputs = [ "bin" "dev" ]
++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man"
++ [ "out" ];

meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm";