From e02b544e4d131d0f8223a84b56b146361d4be838 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 27 Feb 2017 11:01:51 -0600 Subject: [PATCH] ark: Make free by default --- pkgs/applications/kde/ark/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index f3adf1828de9..e1e25b2acf24 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, kdeWrapper, + kdeApp, lib, config, kdeWrapper, extra-cmake-modules, kdoctools, makeWrapper, @@ -7,7 +7,10 @@ kservice, kpty, kwidgetsaddons, libarchive, # Archive tools - p7zip, unrar, unzipNLS, zip + p7zip, unzipNLS, zip, + + # Unfree tools + unfreeEnableUnrar ? false, unrar, }: let @@ -23,15 +26,16 @@ let ]; postInstall = let - PATH = lib.makeBinPath [ - p7zip unrar unzipNLS zip - ]; + PATH = + lib.makeBinPath + ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar); in '' wrapProgram "$out/bin/ark" \ --prefix PATH : "${PATH}" ''; meta = { - license = with lib.licenses; [ gpl2 lgpl3 ]; + license = with lib.licenses; + [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree; maintainers = [ lib.maintainers.ttuegel ]; }; };