mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Code Issues Wiki Activity
105790 commits 268 branches 125 tags 5.4 GiB
Commit graph

105790 commits

This branch
This branch
All branches
Author SHA1 Message Date
aszlig b017935103
vlc: Fix build for Qt >= 5.7.0 
This basically does something similar than the AUR build:

https://aur.archlinux.org/packages/vlc-qt5/

On our side, all there is to do is to force compiling using C++11 mode
and use a patch that the AUR package took from the following upstream
patchwork URL:

https://patches.videolan.org/patch/14061/

Instead of passing CXXFLAGS to the configure script, I'm using sed here
to make sure we don't override flags figured out by configure.

For example if ./configure is used with CXXFLAGS=-std=c++11 appended or
prepended, we have something like:

... -I../include   -std=c++11 -Wall -Wextra -Wsign-compare ...

While if we don't do that at all, we have something like:

... -I../include   -g -O2 -Wall -Wextra -Wsign-compare ...

Another way would be to use NIX_CFLAGS_COMPILE, but that would affect
even compilation of C code and thus resulting in a bunch of warnings
like this:

cc1: warning: command line option '-std=c++11' is valid for C++/ObjC++
              but not for C

So with our approach the flags during build look much better:

... -I../include   -std=c++11 -g -O2 -Wall -Wextra -Wsign-compare ...

Another thing I've changed is that the vlc_qt5 attribute in
all-packages.nix now uses the latest Qt 5 version, because the build for
Qt >= 5.7.0 is now no longer broken.

I've also ordered the preConfigure attribute before the configureFlags
attribute, because it makes more sense in terms of context (pre ->
configure -> post).

Tested by building on x86_64-linux with libsForQt56.vlc, libsForQt58.vlc
and vlc (the Qt 4 version, just to be sure I didn't accidentally break
it).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @ttuegel
 2017-04-19 05:09:47 +02:00
Jaka Hudoklin e0b0a07a74 Merge pull request #23073 from volth/libguestfs-1.34 
libguestfs: 1.29.5 -> 1.36.3
 2017-04-19 02:01:54 +02:00
Joachim F 1dcb587d93 Merge pull request #24888 from Ralith/electron 
electron: 1.4.15 -> 1.6.2
 2017-04-18 21:47:33 +01:00
Jörg Thalheim dc017e634c Merge pull request #25001 from jb55/new/pidgin-carbons 
pidgin-carbons: init at 0.1.3
 2017-04-18 22:46:51 +02:00
Joachim F 0d6caccfb4 Merge pull request #24979 from mdorman/emacs-updates 
Automated Emacs package updates
 2017-04-18 21:37:48 +01:00
Benno Fünfstück bc09640d91 Merge pull request #24977 from dsprenkels/master 
mpDris2: 0.6 -> 0.7
 2017-04-18 22:29:06 +02:00
Jörg Thalheim f27206c952 Merge pull request #24993 from romildo/upd.elementary-icon-theme 
elementary-icon-theme: 4.0.1.1 -> 4.0.3
 2017-04-18 22:09:15 +02:00
Jörg Thalheim 6231781930 Merge pull request #24992 from romildo/upd.mate 
mate-themes: 3.22.7 -> 3.22.10, mate-icon-theme: 1.18.0 -> 1.18.1
 2017-04-18 22:09:01 +02:00
armijnhemel a8c8d5a588 upx: 3.91 -> 3.93 
* moved from sourceforge to github
 2017-04-18 21:49:54 +02:00
Jörg Thalheim 41b43c0b64 Merge pull request #25000 from NickHu/fdr 
fdr: fix Qt library dependency
 2017-04-18 21:46:20 +02:00
Jörg Thalheim 032cf416ef Merge pull request #25002 from romildo/upd.flat-plat 
flat-plat: 2016-12-03 -> 20170323
 2017-04-18 21:41:34 +02:00
James ‘Twey’ Kay cba00cb44b
git-lfs: 1.3.1 -> 2.0.2 
fixes #25004
 2017-04-18 21:39:12 +02:00
Masayuki Takeda 733cc23a1b
slock: add configFile support 
fixes #24994
 2017-04-18 21:06:17 +02:00
John Ericson 1eabc23961 Merge pull request #24980 from Ericson2314/platform-normalization 
Doc for Platform Normalization
 2017-04-18 13:34:56 -04:00
Vincent Laporte 0c8cf28091 ocamlPackages.llvm: fix hash 2017-04-18 17:32:18 +00:00
Vincent Laporte 2230009e7d ocaml: 4.04.0 -> 4.04.1 2017-04-18 17:19:16 +00:00
Vincent Laporte ca47895d7f ocamlPackages.batteries: 2.5.3 -> 2.6.0 2017-04-18 17:19:16 +00:00
Daiderd Jordan da811a56b5 Merge pull request #24976 from hamishmack/darwin-icons 
defaultIconTheme: Enable darwin support
 2017-04-18 19:16:43 +02:00
Benno Fünfstück eb1e63505a wai-app-file-cgi: remove outdated overrides 2017-04-18 18:52:06 +02:00
John Ericson c13457fe58 doc: Document the structure of {build,host,target}Platforms 
Worthwhile to do now that #24610 makes it less abysmal.
 2017-04-18 12:48:16 -04:00
romildo e7a3186d28 flat-plat: 2016-12-03 -> 20170323 2017-04-18 13:41:10 -03:00
Benjamin Staffin 2c14055aaa Merge pull request #24990 from jlesquembre/git-recent 
git-recent: init at 1.0.3
 2017-04-18 12:33:05 -04:00
William Casarin 36bd9d2463 pidgin-carbons: init at 0.1.3 
Implements XMPP extension XEP-0280: Message Carbons for pidgin
 2017-04-18 09:26:05 -07:00
Nick Hu e0bf92950c fdr: fix Qt library dependency 2017-04-18 17:09:54 +01:00
Jörg Thalheim b2ed3db94a Merge pull request #24962 from makefu/modules/command-not-found/refactor 
Refactor command-not-found
 2017-04-18 17:18:20 +02:00
Daan Sprenkels 0479e68db9 mpDris2: 0.6 -> 0.7 2017-04-18 14:38:24 +02:00
Vladimír Čunát 91ad6b3597
Revert "grub module: fix efiInstallAsRemovable description" 
This reverts commit c2b56626f1.
It broke creating the manual.  I suspect the descriptions are
auto-wrapped by <para> and </para>.

We've been through this already in 3af715af90.
/cc #24978, @zraexy, @Mic92.
 2017-04-18 14:26:36 +02:00
Tim Steinbach 7643c7c8cc
linux: 4.4.61 -> 4.4.62 2017-04-18 08:22:23 -04:00
Tim Steinbach 5283e644ce
linux: 4.10.10 -> 4.10.11 2017-04-18 08:20:40 -04:00
Frederik Rietdijk dd662792b1 kdeApplications.kolourpaint: init at 16.12.3 2017-04-18 14:18:19 +02:00
Tim Steinbach 1173fe0b49
linux: 4.9.22 -> 4.9.23 2017-04-18 08:15:48 -04:00
Frederik Rietdijk c275158f06 python36: 3.6.0 -> 3.6.1 2017-04-18 13:14:40 +02:00
romildo 71af44cae9 elementary-icon-theme: 4.0.1.1 -> 4.0.3 2017-04-18 06:49:25 -03:00
romildo 245cf6fa0e mate-themes: 3.22.7 -> 3.22.10 2017-04-18 06:43:13 -03:00
romildo ad95a04fa5 mate-icon-theme: 1.18.0 -> 1.18.1 2017-04-18 06:42:01 -03:00
Frederik Rietdijk 8cc5530a73 pythonPackages.qtconsole: use pyqt5 backend 
instead of pyqt4 which required building qt4.
 2017-04-18 11:21:20 +02:00
José Luis Lafuente 7b20341727
git-recent: init at 1.0.3 2017-04-18 11:09:33 +02:00
Frederik Rietdijk 8d491ec6c6 Python docs: Python 2.x namespace packages may collide when using .withPackages 2017-04-18 09:05:00 +02:00
Benjamin Staffin 8cf393bf48 Merge pull request #24947 from timclassic/docker-repro 
docker: improve reproducibility of layers
 2017-04-17 22:16:33 -04:00
John Ericson 9239bc6c96 Merge pull request #24982 from Ericson2314/fix 
release-cross: Fix more typos---this is embarrising
 2017-04-17 21:06:34 -04:00
John Ericson 5c91dc9bcf release-cross: Fix more typos---this is embarrising 2017-04-17 21:02:56 -04:00
John Ericson 1832a34a9a Merge pull request #24981 from Ericson2314/fix 
release-cross: Fix typo preventing evaluation
 2017-04-17 20:54:32 -04:00
John Ericson 9169f3c924 release-cross: Fix typo preventing evaluation 2017-04-17 20:22:37 -04:00
Jörg Thalheim 6b7c5ba535
display-manager: fix argument handling of sddm 
previously session type was not correctly set.

fixes #23264
 2017-04-18 01:41:17 +02:00
Jörg Thalheim 81e6e21175 Merge pull request #24521 from orivej/instead-launcher 
instead-launcher: init at 0.6.3
 2017-04-18 01:36:40 +02:00
Jörg Thalheim ae49647e9c Merge pull request #24975 from lheckemann/inkscape-potrace 
inkscape: add potrace
 2017-04-18 01:16:55 +02:00
Jörg Thalheim 6e63f41081 Merge pull request #24978 from zraexy/zraexy-grub 
grub module: fix efiInstallAsRemovable description
 2017-04-18 01:10:31 +02:00
zraexy c2b56626f1 grub module: fix efiInstallAsRemovable description 2017-04-17 14:45:56 -08:00
Michael Alan Dorman 0e5d43d8f1 melpa-packages: 2017-04-17 
Removals:
 - coati: renamed to sourcetrail
 - fuel: git repo not accessible
 - jade: renamed to indium
 - matrix-client: package removed from melpa
 2017-04-17 18:41:30 -04:00
Michael Alan Dorman 607a72a2f1 melpa-stable-packages: 2017-04-17 
Removals:
 - fuel: git repo not accessible
 - jade: renamed to indium
 2017-04-17 18:41:29 -04:00