alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
81804 commits 217 branches 121 tags 4.5 GiB
Commit graph

81804 commits

This branch
This branch
All branches
Author SHA1 Message Date
aszlig fb74d901d7 boost: Add patch for mingw to use gas instead. 
The upstream sources only compile with masm, so we need to add a patch
that translates the masm sources to GNU assembler. Unfortunately, this
means, that "generic.nix" is no longer very much generic, but the
versions we currently include work fine with the patch.

Unfortunately, the boost build still doesn't finish, but we're getting
there soon enough.

The patch is from https://svn.boost.org/trac/boost/ticket/7262 and
following the discussion it seems that the upstream authors are
unwilling to add a gas version for the Windows platform. So in the long
term we might need to find a better solution to that, like for example
using Wine to run MASM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-04-23 10:52:07 +02:00
aszlig 5f0f48c08b boost: Reduce noise during cross compile. 
I guess the "set -x" was only left there for debugging, so I'm removing
it because it let's the scrollback buffer explode ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-04-23 10:52:06 +02:00
aszlig 2d760a28b3 boost: Supply some configure flags for mingw. 
Otherwise, Boost.Build is trying to compile against pthread and
desperately searches for icu/iconv.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-04-23 10:52:06 +02:00
aszlig ad033f7665 boost: Fix generation of crossB2Args. 
`concatMapStringsSep` actually needs a function to work on the list
items, but it was probably a leftover from the refactor in af8654d.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-04-23 10:52:06 +02:00
Vladimír Čunát 7aae991fa2 imagemagick: fix on mingw, only static ATM 
The output gets rather large (67 MB) as *each* executable gets ~5 MB of
magick stuff statically. It seems we would have to fix or disable
libxml2 first to get around this blowup.
 2016-04-23 10:52:05 +02:00
Vladimír Čunát 960244c0af poppler: improve on mingw 
The minimal version should be fine now.
 2016-04-23 10:52:05 +02:00
Vladimír Čunát 076a09ee37 poppler: disable some dependencies for minimal config 
lcms, openjpeg and curl don't seem to be so necessary.
 2016-04-23 10:52:05 +02:00
Vladimír Čunát 7d4ebb526c libjpeg(-turbo): fix on mingw 
By porting a patch from msys2.
 2016-04-23 10:52:04 +02:00
Vladimír Čunát bd3d377e5e freetype: fix on mingw 2016-04-23 10:52:04 +02:00
Vladimír Čunát 321ecde8a1 zlib: on mingw, add another DLL link 
Also clean up the expression a little.
It fixes at least libpng's DLL.
 2016-04-23 10:52:03 +02:00
Vladimír Čunát 80509ab287 libpng: fix on mingw by disabling doCheck 2016-04-23 10:52:03 +02:00
Vladimír Čunát 49bec81730 libxslt: fix on mingw by upstream patch 
It's only static, as libxml2 is only static ATM.
 2016-04-23 10:52:03 +02:00
Vladimír Čunát 94eba25103 libxml2: fix on mingw, without DLLs ATM 
After closure-size merge we need to disable python support,
as python upstream doesn't support cross-building linux -> mingw.
 2016-04-23 10:52:02 +02:00
Vladimír Čunát 91f2b9ed66 bzip2: fix on mingw 
The whole expression is rather a mess, mainly due to upstream
often behaving badly with non-standard configurations.
 2016-04-23 10:52:01 +02:00
Vladimír Čunát 8b292a1b35 stdenv on mingw: fix 64-bin DLL detection in some cases 
In particular, this makes 64-bit libpng create DLL now,
and thus depending packages won't fail anymore (e.g. freetype).
 2016-04-23 10:52:01 +02:00
Vladimír Čunát afaf1c2f77 gettext: remove crossAttrs 
They seem not needed anymore.
 2016-04-23 10:52:00 +02:00
Vladimír Čunát 6e7787e666 stdenv for windows: auto-link dependency DLLs 
For every *.{exe,dll} in $output/bin/ we try to find all (potential)
transitive dependencies and symlink those DLLs into $output/bin
so they are found on invocation.
(DLLs are first searched in the directory of the running exe file.)

The links are relative, so relocating whole /nix/store won't break them.
The hook is activated on cygwin and when cross-compiling to mingw.
 2016-04-23 10:52:00 +02:00
Vladimír Čunát 13df963c7e mingw: update 3.1.0 -> 4.0.6 2016-04-21 13:38:20 +02:00
Vladimír Čunát a047ba25f4 libiconv: fix on mingw 2016-04-21 13:25:33 +02:00
Thomas Tuegel 9ea3e371df qt5: handle dev output even without qmake 2016-04-21 04:57:01 -05:00
Nikolay Amiantov b845596f66 golden-cheetah: use qmakeHook 2016-04-21 03:13:04 +03:00
Vladimír Čunát 1c8ac52999 groff: now really fix build after --docdir fix 
I forgot about some later changes around characters permitted in
$shareDocName.
 2016-04-20 20:37:19 +02:00
Nikolay Amiantov 35cef635ff Merge branch 'qmake-hook' into staging 2016-04-20 19:18:36 +03:00
Nikolay Amiantov 039ff272ee qt55: remove configureScript from qt5Submodule 2016-04-20 19:02:13 +03:00
Nikolay Amiantov 294d1f4c70 cmst: move to qmakeHook 
This reverts commit 2c024d28a2.
 2016-04-20 18:55:56 +03:00
Nikolay Amiantov 8ab48c32e7 yubikey-personalization-gui: move to qmake4Hook 2016-04-20 18:55:56 +03:00
Nikolay Amiantov ea56bb7331 rockbox-utility: move to qmake4Hook 2016-04-20 18:55:56 +03:00
Nikolay Amiantov 6adce0a785 touchegg: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Nikolay Amiantov 5a4cccd7e7 nifskope: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Nikolay Amiantov cef0e565e3 unetbootin: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Nikolay Amiantov a3a40c027c qastools: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Nikolay Amiantov c48dd664ff jom: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Nikolay Amiantov e282d36143 wpa_supplicant_gui: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov de1ce6a102 l7z: spaces 2016-04-20 18:55:54 +03:00
Nikolay Amiantov 34625f646c ppsspp: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov 02014ea0aa mudlet: move to qmakeHook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov f8d96d1983 chessx: move to qmakeHook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov f3e8653647 valkyrie: move to qmake4Hook 2016-04-20 18:55:54 +03:00
Nikolay Amiantov a9662f8c45 qtcreator: move to qmakeHook 2016-04-20 18:55:53 +03:00
Nikolay Amiantov c161258003 pyqt5: move to qmakeHook 
This reverts commit f1c2572479.
 2016-04-20 18:55:53 +03:00
Nikolay Amiantov 79008f6095 signon: move to qmakeHook 
This reverts commit 96bed5b7aa.
 2016-04-20 18:55:53 +03:00
Nikolay Amiantov 1b032e5221 qwt: move to qmake4Hook 2016-04-20 18:55:53 +03:00
Nikolay Amiantov d441238b52 qt5.qwt: move to qmakeHook 
This reverts commit 8779e0f274.
 2016-04-20 18:55:53 +03:00
Nikolay Amiantov 82af8640e3 quazip: move to qmakeHook 
This reverts commit d663b3df24.
 2016-04-20 18:55:52 +03:00
Nikolay Amiantov 1875538730 qtscriptgenerator: spaces 2016-04-20 18:55:52 +03:00
Nikolay Amiantov 5b17e82559 qt55.qtmultimedia: use qmakeFlags 2016-04-20 18:55:52 +03:00
Nikolay Amiantov 4a4567b731 qt54.qtmultimedia: use qmakeFlags 2016-04-20 18:55:52 +03:00
Nikolay Amiantov b69940ee76 qscintilla: move to qmake4Hook 2016-04-20 18:55:52 +03:00
Nikolay Amiantov e307c3dac2 qoauth: move to qmake4Hook 2016-04-20 18:55:51 +03:00
Nikolay Amiantov 005dab1a7a qmltermwidget: move to qmakeHook 
This reverts commit 2d6ea2cc30.
 2016-04-20 18:55:51 +03:00