diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-03-06 20:39:27 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-06 20:39:27 +0300 |
commit | 234c5dce67eb11b1ce0e96b8de9e4b7876734d1f (patch) | |
tree | c7ab0988758d03967bc4bd9304ffdb6189020609 | |
parent | 263488530e33176d1f12dafb1496e520354e6938 (diff) | |
parent | d80811d881ca35f5771b5922b0d8b212d1c90db1 (diff) | |
download | nixlib-234c5dce67eb11b1ce0e96b8de9e4b7876734d1f.tar nixlib-234c5dce67eb11b1ce0e96b8de9e4b7876734d1f.tar.gz nixlib-234c5dce67eb11b1ce0e96b8de9e4b7876734d1f.tar.bz2 nixlib-234c5dce67eb11b1ce0e96b8de9e4b7876734d1f.tar.lz nixlib-234c5dce67eb11b1ce0e96b8de9e4b7876734d1f.tar.xz nixlib-234c5dce67eb11b1ce0e96b8de9e4b7876734d1f.tar.zst nixlib-234c5dce67eb11b1ce0e96b8de9e4b7876734d1f.zip |
Merge commit 'refs/pull/13667/head' of git://github.com/NixOS/nixpkgs
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/ahoviewer/default.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 39 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0b5883f291e1..b908ec3115ab 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -309,6 +309,7 @@ sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>"; sjourdois = "Stéphane ‘kwisatz’ Jourdois <sjourdois@gmail.com>"; skeidel = "Sven Keidel <svenkeidel@gmail.com>"; + skrzyp = "Jakub Skrzypnik <jot.skrzyp@gmail.com>"; sleexyz = "Sean Lee <freshdried@gmail.com>"; smironov = "Sergey Mironov <ierton@gmail.com>"; spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>"; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix new file mode 100644 index 000000000000..79d6ff06578c --- /dev/null +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, + gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, + librsvg, gst_all_1, autoreconfHook, makeWrapper }: +stdenv.mkDerivation { + name = "ahoviewer-1.4.6"; + src = fetchFromGitHub { + owner = "ahodesuka"; + repo = "ahoviewer"; + rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa"; + sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb"; + }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 + libsecret curl unrar libzip librsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + gst_all_1.gst-plugins-base ]; + postPatch = ''patchShebangs version.sh''; + postInstall = '' + wrapProgram $out/bin/ahoviewer \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + meta = { + homepage = "https://github.com/ahodesuka/ahoviewer"; + description = "A GTK2 image viewer, manga reader, and booru browser"; + maintainers = [ stdenv.lib.maintainers.skrzyp ]; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ]; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c540ff849c8a..52c5e120ff45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11399,6 +11399,8 @@ let gtk = gtk2; }; + ahoviewer = callPackage ../applications/graphics/ahoviewer { }; + alchemy = callPackage ../applications/graphics/alchemy { }; alock = callPackage ../misc/screensavers/alock { }; |