From 5da88a18c9fc30d3926c1ff10acfa1082abaddcc Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:18 +0000 Subject: [PATCH] rsync: move defaults to package file --- pkgs/applications/networking/sync/rsync/default.nix | 2 +- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 0b4d580cd209..4045c1f0fc51 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libiconv, zlib, popt -, enableACLs ? true, acl ? null +, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null , enableCopyDevicesPatch ? false }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e600648f69a..db91b61ac35b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19117,10 +19117,7 @@ in llvmPackages = llvmPackages_7; }; - rsync = callPackage ../applications/networking/sync/rsync { - enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); - enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); - }; + rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; rtl_433 = callPackage ../applications/misc/rtl_433 { };