Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 95f82e2a4526
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 434032913660
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 22, 2020

  1. p7zip: Make unfree features (rar support) optional

    @adisbladis
    adisbladis committed Apr 22, 2020
    Copy the full SHA
    955e235 View commit details

  2. Merge pull request #85782 from adisbladis/p7zip-unfree 

    p7zip: Make unfree features (rar support) optional
    @adisbladis
    adisbladis authored Apr 22, 2020
    Copy the full SHA
    4340329 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/tools/archivers/p7zip/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/archivers/p7zip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib, enableUnfree ? false }:

stdenv.mkDerivation rec {
pname = "p7zip";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
substituteInPlace makefile.machine \
--replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \
--replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
'' + ''
'' + lib.optionalString (!enableUnfree) ''
# Remove non-free RAR source code
# (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar)
rm -r CPP/7zip/Compress/Rar*
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.raskin ];
# 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;
};
}