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

ahoviewer: add useUnrar option

Browse Source
This commit is contained in:
Albert Safin 2018-03-25 14:33:41 +07:00 committed by Matthew Justin Bauer
parent fa4956d091
commit c276b45476
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/graphics/ahoviewer/default.nix
View File

@ -1,6 +1,10 @@
{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, gtkmm2, glibmm, libxml2, libsecret, curl, libzip,
librsvg, gst_all_1, autoreconfHook, makeWrapper }: librsvg, gst_all_1, autoreconfHook, makeWrapper,
useUnrar ? false, unrar
}:
assert useUnrar -> unrar != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ahoviewer-${version}"; name = "ahoviewer-${version}";
@ -16,12 +20,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 buildInputs = [
libsecret curl unrar libzip librsvg glibmm libconfig gtkmm2 glibmm libxml2
libsecret curl libzip librsvg
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good
gst_all_1.gst-libav gst_all_1.gst-libav
gst_all_1.gst-plugins-base ]; gst_all_1.gst-plugins-base
] ++ stdenv.lib.optional useUnrar unrar;
# https://github.com/ahodesuka/ahoviewer/issues/60 # https://github.com/ahodesuka/ahoviewer/issues/60
# Already fixed in the master branch # Already fixed in the master branch

4
pkgs/top-level/all-packages.nix
View File

@ -14644,7 +14644,9 @@ with pkgs;
stdenv = overrideCC stdenv gcc49; stdenv = overrideCC stdenv gcc49;
}; };
ahoviewer = callPackage ../applications/graphics/ahoviewer { }; ahoviewer = callPackage ../applications/graphics/ahoviewer {
useUnrar = config.ahoviewer.useUnrar or false;
};
airwave = callPackage ../applications/audio/airwave/default.nix { }; airwave = callPackage ../applications/audio/airwave/default.nix { };