diff options
author | pacien <pacien.trangirard@pacien.net> | 2021-07-16 04:43:51 +0200 |
---|---|---|
committer | pacien <pacien.trangirard@pacien.net> | 2021-07-16 04:43:51 +0200 |
commit | f8d0efbf3753673bd51739bbf3c369b94e41db36 (patch) | |
tree | b66306ebef735346672ceea6d1914276dda6a63f | |
parent | d3ebf3bfa10b4e18385f3792c69f76f5be7e1b04 (diff) | |
download | nixpkgs-f8d0efbf3753673bd51739bbf3c369b94e41db36.tar nixpkgs-f8d0efbf3753673bd51739bbf3c369b94e41db36.tar.gz nixpkgs-f8d0efbf3753673bd51739bbf3c369b94e41db36.tar.bz2 nixpkgs-f8d0efbf3753673bd51739bbf3c369b94e41db36.tar.lz nixpkgs-f8d0efbf3753673bd51739bbf3c369b94e41db36.tar.xz nixpkgs-f8d0efbf3753673bd51739bbf3c369b94e41db36.tar.zst nixpkgs-f8d0efbf3753673bd51739bbf3c369b94e41db36.zip |
xarchiver: replace unfree rar handler
Since version 0.5.4.11, Xarchiver supports using either unrar or unar to unpack .rar files. The former being released under an unfree license, using the latter by default is preferable. This avoids indirectly guarding the xarchiver package under `nixpkgs.config.allowUnfree` due to the dependency on unrar. Users who would like to use the unfree implementation may do so by adding the unrar package to the environment from which they are calling xarchiver.
-rw-r--r-- | pkgs/tools/archivers/xarchiver/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index e9409221069..57d35633128 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gtk3, pkg-config, intltool, libxslt, makeWrapper, - coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: + coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { version = "0.5.4.17"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/xarchiver \ - --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} + --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unar gnutar bzip2 gzip lhasa coreutils ]} ''; meta = { |