diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 12:14:06 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 12:14:06 -0500 |
commit | 5c09d977c794d9243ddac17f6c429b5432431f8f (patch) | |
tree | 1acbd7e7f0c01546d955d47c6a8fddfec8e632b6 /pkgs/applications/graphics | |
parent | 21d991b1fd78214023551a0dada17b129cbd5cd5 (diff) | |
parent | 18d059a4ac001fbaa9c2abc750a2830a52e1dae5 (diff) | |
download | nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.gz nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.bz2 nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.lz nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.xz nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.zst nixlib-5c09d977c794d9243ddac17f6c429b5432431f8f.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/astah-community/default.nix | 63 |
3 files changed, 4 insertions, 67 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 669c7c8f9612..efbf5864faa8 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkgconfig, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif + libpng libtiff libxml2 libheif djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 79149dc83cf8..b3a1b64cae96 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif libde265 + libpng libtiff libxml2 libheif libde265 djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/astah-community/default.nix b/pkgs/applications/graphics/astah-community/default.nix deleted file mode 100644 index 72d367d8fea2..000000000000 --- a/pkgs/applications/graphics/astah-community/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }: - -let - - name = "astah-community"; - version = "7.2.0"; - postfix = "1ff236"; - desktopIcon = fetchurl { - name = "${name}.png"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; - sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm"; - }; - mimeXml = fetchurl { - name = "${name}.xml"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87"; - sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b"; - }; - desktopItem = makeDesktopItem { - name = name; - exec = "astah %U"; - icon = "${desktopIcon}"; - comment = "Lightweight, easy-to-use, and free UML2.x modeler"; - desktopName = "Astah* Community"; - genericName = "Astah* Community"; - mimeType = "application/x-astah"; - categories = "Application;Development;"; - extraEntries = "NoDisplay=false"; - }; - -in - -stdenv.mkDerivation { - name = "${name}-${version}"; - - src = fetchurl { - url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip"; - sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499"; - }; - - nativeBuildInputs = [ unzip makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share} - cp -r . $out/share/astah - cp -r ${desktopItem}/share/applications $out/share/applications - - install -D ${desktopIcon} $out/share/pixmaps/${name}.png - install -D ${mimeXml} $out/share/mime/packages/${name}.xml - - makeWrapper ${jre}/bin/java $out/bin/astah \ - --add-flags "-jar $out/share/astah/astah-community.jar" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Lightweight, easy-to-use, and free UML2.x modeler"; - homepage = http://astah.net/editions/community; - license = licenses.unfree; - }; -} |