diff options
author | Will Dietz <w@wdtz.org> | 2019-03-09 19:23:34 -0600 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2019-03-09 19:30:09 -0600 |
commit | 812a99cdd32fbe686bbff5ecb7cfda22f45c4022 (patch) | |
tree | ba96cc482b2b134807b1f4a0a19c3b10d75c649d /pkgs | |
parent | 39a85789319e2971d3f0a1910d8d95136c3509c8 (diff) | |
download | nixpkgs-812a99cdd32fbe686bbff5ecb7cfda22f45c4022.tar nixpkgs-812a99cdd32fbe686bbff5ecb7cfda22f45c4022.tar.gz nixpkgs-812a99cdd32fbe686bbff5ecb7cfda22f45c4022.tar.bz2 nixpkgs-812a99cdd32fbe686bbff5ecb7cfda22f45c4022.tar.lz nixpkgs-812a99cdd32fbe686bbff5ecb7cfda22f45c4022.tar.xz nixpkgs-812a99cdd32fbe686bbff5ecb7cfda22f45c4022.tar.zst nixpkgs-812a99cdd32fbe686bbff5ecb7cfda22f45c4022.zip |
ipe: be explicit about libpng, use lua 5.3 per readme
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/ipe/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index cfe51de3cc5..0673eec8c86 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, qtbase +, libjpeg, libpng, qtbase }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript + libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97777d8a1a4..04ab789fba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17860,6 +17860,7 @@ in ipe = libsForQt5.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; + lua5 = lua5_3; }; iptraf = callPackage ../applications/networking/iptraf { }; |