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

Merge pull request #85782 from adisbladis/p7zip-unfree

Browse Source 
p7zip: Make unfree features (rar support) optional
This commit is contained in:
adisbladis 2020-04-22 17:43:45 +02:00 committed by GitHub
commit 4340329136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/archivers/p7zip/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, lib, enableUnfree ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "p7zip"; pname = "p7zip";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
substituteInPlace makefile.machine \ substituteInPlace makefile.machine \
--replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \
--replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
'' + '' '' + lib.optionalString (!enableUnfree) ''
# Remove non-free RAR source code # Remove non-free RAR source code
# (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar)
rm -r CPP/7zip/Compress/Rar* rm -r CPP/7zip/Compress/Rar*
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.raskin ]; maintainers = [ stdenv.lib.maintainers.raskin ];
# RAR code is under non-free UnRAR license, but we remove it # RAR code is under non-free UnRAR license, but we remove it
license = stdenv.lib.licenses.lgpl2Plus; license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
}; };
} }