Commit Graph

12 Commits

Author SHA1 Message Date
William A. Kennington III
f30a8f78a8 libpng: 1.2.52 -> 1.2.53 2015-08-05 23:37:07 -07:00
Vladimír Čunát
e72b405104 libpng-1.2: maintenance update
Also drop xz input, as it isn't needed (stdenv unpacks xz by itself).
2015-07-30 13:48:59 +02:00
Mateusz Kowalczyk
aafca4dd51 Add a few meta.branch to please monitor 2014-09-30 10:07:49 +01:00
Mateusz Kowalczyk
fe86a03a1c libpng: use spdx licensing method 2014-09-21 18:53:20 +01:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Jaka Hudoklin
c3524a8dd6 optipng: use system libpng & zlib, fix cross builds and add support for static builds 2014-04-01 01:43:56 +02:00
Vladimír Čunát
ef32fbe6a4 libpng12, libpng15: minor updates of legacy versions 2014-03-13 22:32:17 +01:00
aszlig
cdaced58ae
libpng12/cross: Don't add zlib for Darwin builds.
Cross builds for Darwin already include the CoreFoundation and the
libraries from XCode, so zlib already exists on that platform.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:48 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
3aae4ccffa libpng: Update to 1.2.50 and 1.5.12
Addresses CVE-2012-3386.
2012-07-25 11:04:47 -04:00
Yury G. Kudryashov
5c6a3faf4e Merge ^/nixpkgs/trunk
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
2012-02-19 11:06:00 +00:00
Yury G. Kudryashov
2ebcb95219 Restore libpng-1.2.x
svn path=/nixpkgs/branches/libpng15/; revision=31440
2012-01-08 19:50:06 +00:00