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: 409ca6f1f997
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5219a3ade193
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 1, 2020

  1. rsync: disable the bundled zlib explicitly 

    We've been providing zlib as a buildInput for some time now but rsync
still builds (& links) it's own copy of zlib unless we disable it
explicitly. This cuts down on compilation time but otherwise shouldn't
have any side effects.
    @andir @FRidh
    andir authored and FRidh committed Nov 1, 2020
    Copy the full SHA
    5219a3a View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/applications/networking/sync/rsync/default.nix
8 changes: 7 additions & 1 deletion pkgs/applications/networking/sync/rsync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,13 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableXXHash xxHash;
nativeBuildInputs = [perl];

configureFlags = ["--with-nobody-group=nogroup"]
configureFlags = [
"--with-nobody-group=nogroup"

# disable the included zlib explicitly as it otherwise still compiles and
# links them even.
"--with-included-zlib=no"
]
# Work around issue with cross-compilation:
# configure.sh: error: cannot run test program while cross compiling
# Remove once 3.2.4 or more recent is released.