diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-07 22:08:27 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-07 22:08:27 +0100 |
| commit | e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd (patch) | |
| tree | 4f1e1a834fbbc0e201e0fb453801d005ed22d332 /pkgs/applications/graphics | |
| parent | baee91ec60ca724b00027033a8e0d7f97cf376a7 (diff) | |
| parent | bcfb3dd9c605bf68730757cc60d01dec91f009f2 (diff) | |
| download | nixlib-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar nixlib-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.gz nixlib-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.bz2 nixlib-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.lz nixlib-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.xz nixlib-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.tar.zst nixlib-e9fc4e7db63e91f3e787d9d3bfd91c798e8bd8bd.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ahoviewer/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/git.nix | 6 |
2 files changed, 39 insertions, 3 deletions
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/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index 0e4d7ae1b83f..84e1f783e2a3 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-02-25"; + version = "2016-03-05"; src = fetchgit { - sha256 = "842b1186d38de14221be514a58f77c23d9f83979ea45f846440cf9cbb1f26c1f"; - rev = "c5117ed0f1b522eab10fd2248f140b2acad2a708"; + sha256 = "dc84530d5e0233427acfd132aa08a4cf9973c936ff72a66ee08ecf836200d367"; + rev = "23eb95582da718791103b83ea002e947caa0f5fc"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) |