Commit Graph

21860 Commits

Author SHA1 Message Date
Joachim Fasting
540a6412e3
suitesparse_4_4: NIX_CFLAGS -> NIX_CFLAGS_COMPILE
Tested with nix-build -A suitesparse_4_4
2017-04-12 19:27:03 +02:00
Joachim Fasting
a883581ddb
suitesparse_4_2: remove bogus NIX_CFLAGS
NIX_CFLAGS should be NIX_CFLAGS_COMPILE; since pic is the default, we
simply remove the bogus declaration.

Tested with nix-build -A suitesparse_4_2
2017-04-12 19:26:58 +02:00
Daiderd Jordan
5ba445752b Merge pull request #24700 from hamishmack/fixes-for-macos
gtk fixes for macos
2017-04-12 19:26:32 +02:00
Franz Pletz
29ed67faea
libressl_2_5: 2.5.1 -> 2.5.3 2017-04-11 19:41:01 +02:00
Hamish Mackenzie
4d5ed187d3 gtk-mac-integration: fix gtk3 version
Include a Gtk3 version of gtk-mac-integration.
Add gobjectIntrospection to gtk-mac-integration.
Use propagatedBuildInputs for gtk.
2017-04-10 23:42:04 -07:00
Hamish Mackenzie
da1d13bc07 webkgitgtk: fix 2.14 on macOS
Includes the patches from macports and fixes an issue with the
`otool -L` output that was causing g-ir-scanner to fail.
The paths in the macports patches have been modified so that they
will work with `patches` in nix (an extra directory level was
added).
2017-04-10 23:11:16 -07:00
aszlig
42bb63f803
leptonica: 1.72 -> 1.74.1
The changes are a bit too big to include it here in the commit message,
so if you want the details of what changed, please visit this URL:

http://leptonica.org/source/version-notes.html

I have also provided openjpeg, giflib and libwebp as dependencies so
that Leptonica is able to read/write those file formats.

Additionally I've added a patch that uses pkgconfig to resolve all
dependencies (except giflib), because unlike AC_CHECK_LIB() the
PKG_CHECK_MODULES() macro defines *_LIBS variables to include the linker
search path.

Unfortunately that patch alone is not enough, because the *_LIBS
variable are substituted by the upstream configure.ac to *not* include
the linker search paths, so we need to remove the AC_SUBST() calls
within PKG_CHECK_MODULES().

The only dependency that's not yet using PKG_CHECK_MODULES() is giflib,
because giflib doesn't have a pkg-config description file, therefore
we're using substituteInPlace to insert the linker search path after the
lept.pc file was generated by configure.

Another thing that we no longer need is the dependency on libpng version
1.2, because Leptonica now also works with more recent libpng versions.

Tested by building the package itself and also the following packages
that immediately depend on leptonica:

 * k2pdfopt
 * tesseract
 * jbig2enc

All of these packages succeeded to build on x86_64-linux.

The main reason why I'm bumping Leptonica to version 1.74.1 is that we
need at least version 1.74 to bump Tesseract to the latest upstream
version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-11 03:21:29 +02:00
Franz Pletz
b4c7979363
libgit2: 0.24.6 -> 0.25.1 2017-04-10 14:31:26 +02:00
Nikolay Amiantov
ef1e28f5f6 qt56.qtwebengine: patch more library paths
Backport 040b86a96e.
2017-04-10 11:35:00 +03:00
Daiderd Jordan
f8230518a2 Merge pull request #24762 from matthewbauer/darwin-misc-fixes
darwin: miscellaneous fixes
2017-04-10 08:50:15 +02:00
David McFarland
f2655dd0c7 mesa: patch vulkan manifests when any driver is enabled 2017-04-10 00:17:36 +03:00
Daiderd Jordan
35eb784bf2 Merge pull request #24761 from matthewbauer/hidapi2
hidapi: fix macos
2017-04-09 22:39:15 +02:00
Matthew Bauer
cba6e28766
hidapi: fix macos 2017-04-09 15:21:26 -05:00
Peter Simons
4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs
Mark linux-only pkgs
2017-04-09 14:18:10 +02:00
Franz Pletz
a49481a740 Merge pull request #24763 from matthewbauer/darwin-glfw-fixes
glfw: fix darwin build
2017-04-09 11:17:42 +02:00
Matthew Bauer
8df24b78d5
wxGTK28: linux only 2017-04-09 02:11:16 -05:00
Matthew Bauer
23d8b4f10c
glfw: fix darwin build 2017-04-09 00:23:24 -05:00
Matthew Bauer
3baff95efd
botan: fix macOS build 2017-04-08 23:49:55 -05:00
Matthew Bauer
3f2560cc08
xbase: make linux-only 2017-04-08 23:34:51 -05:00
Matthew Bauer
a1f22aafa2
neardal: make linux-only 2017-04-08 23:34:51 -05:00
Matthew Bauer
04f8199e5b
libx86emu: make linux-only 2017-04-08 23:34:41 -05:00
Matthew Bauer
719cb89342
wxsqlite3: fix macOS build 2017-04-08 23:28:01 -05:00
Matthew Bauer
6a6b371a77
liblastfm: fix macOS build 2017-04-08 23:28:01 -05:00
Cole Scott
7c32b93c9a
arm-frc-linux-gnueabi-eglibc: init at 2.21-r0.83 2017-04-09 01:06:33 +02:00
Cole Scott
9597247cc0
arm-frc-linux-gnueabi-linux-api-headers: init at 3.19-r0.36 2017-04-09 01:06:33 +02:00
Thomas Tuegel
e0b1288ebd Merge pull request #24340 from periklis/topic_qt58_modules
qt58: extend darwin compatibility
2017-04-08 07:32:21 -05:00
Aristid Breitkreuz
43626b6a88 Merge pull request #24698 from MP2E/ffmpeg_sdl2
ffmpeg-full: replace SDL support with SDL2 support
2017-04-08 12:16:11 +02:00
Aristid Breitkreuz
6dd7dd52b8 Merge pull request #24539 from Ralith/vulkan-loader
vulkan-loader: 1.0.39.1 -> 1.0.42.2
2017-04-08 11:48:04 +02:00
Aristid Breitkreuz
290315ff6a Merge pull request #24627 from mdaiter/suitesparseCUDATouchups
suitesparse: refining CUDA support
2017-04-08 11:45:17 +02:00
Periklis Tsirakidis
775531c1e3 qt58: extend darwin compatibility 2017-04-08 09:54:46 +02:00
Dan Peebles
57e25171a5 Merge branch 'master' into staging 2017-04-07 08:28:07 -04:00
Dan Peebles
27cec397b1 itk: 4.10 -> 4.11
Also includes a patch to work against clang 4, which was my original
motivation for the 4.10 -> 4.11 upgrade (since it fixed another issue)
2017-04-07 08:23:08 -04:00
Dan Peebles
1be61d1921 podofo: fix on LLVM 4
Not sure if the things I made optional on Darwin are really worth keeping
at all, but I don't have a Linux box handy so I'm minimizing potential
damage.
2017-04-06 23:33:14 -04:00
Cray Elliott
5b6b1100f3 ffmpeg-full: replace SDL support with SDL2 support
ffmpeg 3.2 dropped support for SDL1 completely, so migrate to SDL2
2017-04-06 20:13:47 -07:00
Dan Peebles
81352b2cb5 Merge branch 'master' into staging 2017-04-06 21:26:24 -04:00
Dan Peebles
6b1957d17a qt5: fix to work on LLVM 4
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-06 21:00:28 -04:00
Hamish Mackenzie
bde6e3da6f Fix geoclue build on Darwin 2017-04-07 00:45:54 +02:00
Vladimír Čunát
10dc47e5e1
Merge #24558: qt58: Fix path to qhelpgenerator
Fixes #24659.
2017-04-06 00:47:58 +02:00
Vladimír Čunát
c6bc4cfdbc
Merge branch 'master' into staging 2017-04-06 00:16:59 +02:00
Jörg Thalheim
052cd88921 Merge pull request #24625 from Mic92/networkmanager
networkmanager: 1.4.4 -> 1.6.4
2017-04-05 12:49:58 +02:00
Peter Simons
bbbe24f469 Merge pull request #24530 from mulderr/master
oracle-instantclient: add optional odbc support
2017-04-05 10:24:49 +02:00
Shea Levy
f038db24a6 nix-plugins: 2.0.6 -> 2.0.7.
Fixes warning on nix 1.12
2017-04-04 22:50:00 -04:00
Shea Levy
fe319f8ebd nix-plugins: 2.0.3 -> 2.0.6.
Fixes incompatibility between build-time and link-time nix version
2017-04-04 22:35:35 -04:00
Shea Levy
3f023c8989 nix-plugins: 2.0.2 -> 2.0.3
Fixes darwin build
2017-04-04 15:11:42 -04:00
Jörg Thalheim
b04fb3ffcd Merge pull request #24586 from maurer/bap
Add BAP to nixpkgs
2017-04-04 19:48:49 +02:00
Matthew Maurer
e010c25ba4 libbap: init at master-2017-02-08 2017-04-04 13:17:56 -04:00
Shea Levy
9904019841 nix-plugins: Bump, unbreak 2017-04-04 11:29:40 -04:00
Matthew Daiter
d712c04d25 suitesparse: refining CUDA support 2017-04-04 17:23:20 +02:00
Jörg Thalheim
43c0530ca6
libproxy: fix compilation
also use webkit backend (webkitgtk is also a more common gnome/gtk)
Changelog: https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/NEWS?h=1.6.2
2017-04-04 17:00:40 +02:00
lprndn
f259fa6e91 Merge branch 'master' into lprndn_Nixpkgs 2017-04-03 21:37:11 +02:00