mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
ark: Make free by default
This commit is contained in:
parent
1d14e19fd4
commit
e02b544e4d
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
kdeApp, lib, kdeWrapper,
|
kdeApp, lib, config, kdeWrapper,
|
||||||
|
|
||||||
extra-cmake-modules, kdoctools, makeWrapper,
|
extra-cmake-modules, kdoctools, makeWrapper,
|
||||||
|
|
||||||
@ -7,7 +7,10 @@
|
|||||||
kservice, kpty, kwidgetsaddons, libarchive,
|
kservice, kpty, kwidgetsaddons, libarchive,
|
||||||
|
|
||||||
# Archive tools
|
# Archive tools
|
||||||
p7zip, unrar, unzipNLS, zip
|
p7zip, unzipNLS, zip,
|
||||||
|
|
||||||
|
# Unfree tools
|
||||||
|
unfreeEnableUnrar ? false, unrar,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -23,15 +26,16 @@ let
|
|||||||
];
|
];
|
||||||
postInstall =
|
postInstall =
|
||||||
let
|
let
|
||||||
PATH = lib.makeBinPath [
|
PATH =
|
||||||
p7zip unrar unzipNLS zip
|
lib.makeBinPath
|
||||||
];
|
([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
|
||||||
in ''
|
in ''
|
||||||
wrapProgram "$out/bin/ark" \
|
wrapProgram "$out/bin/ark" \
|
||||||
--prefix PATH : "${PATH}"
|
--prefix PATH : "${PATH}"
|
||||||
'';
|
'';
|
||||||
meta = {
|
meta = {
|
||||||
license = with lib.licenses; [ gpl2 lgpl3 ];
|
license = with lib.licenses;
|
||||||
|
[ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
|
||||||
maintainers = [ lib.maintainers.ttuegel ];
|
maintainers = [ lib.maintainers.ttuegel ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user