diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-22 10:22:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-22 10:22:59 +0200 |
commit | dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f (patch) | |
tree | 0a5ef168686e3f048d77a60eb79605c6868c4c2a /pkgs/applications/networking/sync | |
parent | 2e00ed442014f6e095fb20cc1daec82c2a19b03e (diff) | |
download | nixpkgs-dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f.tar nixpkgs-dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f.tar.gz nixpkgs-dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f.tar.bz2 nixpkgs-dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f.tar.lz nixpkgs-dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f.tar.xz nixpkgs-dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f.tar.zst nixpkgs-dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f.zip |
rsync: format, remove ? null (#131005)
Diffstat (limited to 'pkgs/applications/networking/sync')
-rw-r--r-- | pkgs/applications/networking/sync/rsync/default.nix | 60 |
1 files changed, 33 insertions, 27 deletions
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 7ce0ffb6089..88304e56a40 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,19 +1,25 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt -, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null -, enableLZ4 ? true, lz4 ? null -, enableOpenSSL ? true, openssl ? null -, enableXXHash ? true, xxHash ? null -, enableZstd ? true, zstd ? null +{ lib +, stdenv +, fetchurl +, fetchpatch +, perl +, libiconv +, zlib +, popt +, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl +, acl +, enableLZ4 ? true +, lz4 +, enableOpenSSL ? true +, openssl +, enableXXHash ? true +, xxHash +, enableZstd ? true +, zstd , enableCopyDevicesPatch ? false , nixosTests }: -assert enableACLs -> acl != null; -assert enableLZ4 -> lz4 != null; -assert enableOpenSSL -> openssl != null; -assert enableXXHash -> xxHash != null; -assert enableZstd -> zstd != null; - let base = import ./base.nix { inherit lib fetchurl fetchpatch; }; in @@ -25,17 +31,17 @@ stdenv.mkDerivation rec { patchesSrc = base.upstreamPatchTarball; - srcs = [mainSrc] ++ lib.optional enableCopyDevicesPatch patchesSrc; + srcs = [ mainSrc ] ++ lib.optional enableCopyDevicesPatch patchesSrc; patches = lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff" ++ base.extraPatches; - buildInputs = [libiconv zlib popt] - ++ lib.optional enableACLs acl - ++ lib.optional enableZstd zstd - ++ lib.optional enableLZ4 lz4 - ++ lib.optional enableOpenSSL openssl - ++ lib.optional enableXXHash xxHash; - nativeBuildInputs = [perl]; + buildInputs = [ libiconv zlib popt ] + ++ lib.optional enableACLs acl + ++ lib.optional enableZstd zstd + ++ lib.optional enableLZ4 lz4 + ++ lib.optional enableOpenSSL openssl + ++ lib.optional enableXXHash xxHash; + nativeBuildInputs = [ perl ]; configureFlags = [ "--with-nobody-group=nogroup" @@ -44,13 +50,13 @@ stdenv.mkDerivation rec { # 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. - # The following PR should fix the cross-compilation issue. - # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. - # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=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. + # The following PR should fix the cross-compilation issue. + # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. + # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" ; passthru.tests = { inherit (nixosTests) rsyncd; }; |