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

ipe: be explicit about libpng, use lua 5.3 per readme

Browse Source
This commit is contained in:
Will Dietz
2019-03-09 19:30:09 -06:00
parent 39a8578931
commit 812a99cdd3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/ipe/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript { stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, qtbase , libjpeg, libpng, qtbase
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
LUA_PACKAGE = "lua"; LUA_PACKAGE = "lua";
buildInputs = [ buildInputs = [
libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
]; ];
nativeBuildInputs = [ makeWrapper pkgconfig ]; nativeBuildInputs = [ makeWrapper pkgconfig ];
pkgs/top-level/all-packages.nix
+1
View File
@@ -17860,6 +17860,7 @@ in
ipe = libsForQt5.callPackage ../applications/graphics/ipe { ipe = libsForQt5.callPackage ../applications/graphics/ipe {
ghostscript = ghostscriptX; ghostscript = ghostscriptX;
texlive = texlive.combine { inherit (texlive) scheme-small; }; texlive = texlive.combine { inherit (texlive) scheme-small; };
lua5 = lua5_3;
}; };
iptraf = callPackage ../applications/networking/iptraf { }; iptraf = callPackage ../applications/networking/iptraf { };