From c276b454769999e94a543df0fc3c53be632394e5 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sun, 25 Mar 2018 14:33:41 +0700 Subject: [PATCH] ahoviewer: add useUnrar option --- .../graphics/ahoviewer/default.nix | 32 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 5abe1931d339..5fb7e0078065 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,6 +1,10 @@ -{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, - gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, - librsvg, gst_all_1, autoreconfHook, makeWrapper }: +{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, + gtkmm2, glibmm, libxml2, libsecret, curl, libzip, + librsvg, gst_all_1, autoreconfHook, makeWrapper, + useUnrar ? false, unrar +}: + +assert useUnrar -> unrar != null; stdenv.mkDerivation rec { name = "ahoviewer-${version}"; @@ -13,23 +17,25 @@ stdenv.mkDerivation rec { sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig"; }; - enableParallelBuilding = true; - + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 - libsecret curl unrar libzip librsvg - gst_all_1.gstreamer - gst_all_1.gst-plugins-good - gst_all_1.gst-libav - gst_all_1.gst-plugins-base ]; + buildInputs = [ + glibmm libconfig gtkmm2 glibmm libxml2 + libsecret curl libzip librsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-good + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + ] ++ stdenv.lib.optional useUnrar unrar; # https://github.com/ahodesuka/ahoviewer/issues/60 # Already fixed in the master branch # TODO: remove this next release makeFlags = [ ''LIBS=-lssl -lcrypto'' ]; - + postPatch = ''patchShebangs version.sh''; - + postInstall = '' wrapProgram $out/bin/ahoviewer \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8de01dff6133..6847c309cafc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14644,7 +14644,9 @@ with pkgs; 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 { };