colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testdisk: inline platform specific option defaults

Browse Source 
Makes it easier to read since one does not need to be aware
of overrides in all-packages.nix.
This commit is contained in:
Jörg Thalheim 2019-10-14 10:48:51 +01:00
parent 10bfa40677
commit b2b29d4398
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/system/testdisk/default.nix
View File

@ -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 ];
};
}

5
pkgs/top-level/all-packages.nix
View File

@ -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; };