From b2b29d4398fd048b25ca206d5e45272e871c7ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 14 Oct 2019 10:48:51 +0100 Subject: [PATCH] testdisk: inline platform specific option defaults Makes it easier to read since one does not need to be aware of overrides in all-packages.nix. --- pkgs/tools/system/testdisk/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index 52cb3c4cee14..c157c4a355fd 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -7,8 +7,8 @@ , libjpeg , zlib , libewf -, enableNtfs ? false, ntfs3g ? null -, enableExtFs ? false, e2fsprogs ? null +, enableNtfs ? stdenv.isDarwin, ntfs3g ? null +, enableExtFs ? stdenv.isDarwin, e2fsprogs ? null , enableQt ? false, qtbase ? null, qttools ? null, qwt ? null }: @@ -65,4 +65,3 @@ assert enableQt -> qwt != null; maintainers = with maintainers; [ fgaz eelco ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c65bbc032046..5c6fae4ed5a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6834,10 +6834,7 @@ in xe = callPackage ../tools/system/xe { }; - testdisk = libsForQt5.callPackage ../tools/system/testdisk { - enableExtFs = !stdenv.isDarwin; - enableNtfs = !stdenv.isDarwin; - }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; };