Skip to content

Commit

Permalink
testdisk: inline platform specific option defaults
Browse files Browse the repository at this point in the history
Makes it easier to read since one does not need to be aware
of overrides in all-packages.nix.
  • Loading branch information
Mic92 committed Oct 14, 2019
1 parent 10bfa40 commit b2b29d4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
5 changes: 2 additions & 3 deletions pkgs/tools/system/testdisk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
}:

Expand Down Expand Up @@ -65,4 +65,3 @@ assert enableQt -> qwt != null;
maintainers = with maintainers; [ fgaz eelco ];
};
}

5 changes: 1 addition & 4 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; };

Expand Down

0 comments on commit b2b29d4

Please sign in to comment.