1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Commit graph

17315 commits

Author SHA1 Message Date
William A. Kennington III ba7335700a nghttp2: 1.1.2 -> 1.2.1 2015-08-29 18:19:38 -07:00
Thomas Tuegel e9a8c5a988 Merge pull request #9524 from bjornfor/qt5-mkspecs-libgl
qt5: embed path to mesa (libGL) in Qt mkspecs file
2015-08-29 18:11:15 -05:00
Thomas Tuegel b873f5bd62 Add qtEnv 2015-08-29 17:47:49 -05:00
Bjørn Forsman 06ed82677a qt5: embed path to mesa (libGL) in Qt mkspecs file
Fixes this problem, when building apps in QtCreator:

  ...(compile output window)
  g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -o qt-test3 main.o mainwindow.o moc_mainwindow.o \
      -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL
  collect2: error: ld returned 1 exit status

mesa is already in the closure of Qt, so there is no size increase.
The patch is copied into both qt-5.3 and qt-5.4 directories, like other
patches are.

Note that programs still can _run_ against a different libGL (e.g. one
provided by nvidia) by configuring the dynamic linker. For instance,
NixOS sets the LD_LIBRARY_PATH environment variable to
/run/opengl-driver/lib/, meaning that whatever libGL is found there
will be used instead of the default (mesa).
2015-08-29 22:21:57 +02:00
Vincent Laporte 1a2d05a840 getdata: 0.8.8 -> 0.8.9 2015-08-29 11:57:10 +02:00
William A. Kennington III d2dce19793 uid_wrapper: 1.1.0 -> 1.1.1 2015-08-28 17:53:48 -07:00
William A. Kennington III 3e6092fe6b libraw: 0.16.0 -> 0.17.0 2015-08-28 17:50:55 -07:00
Bjørn Forsman ac613f0748 opencv: remove duplicated -DCMAKE_BUILD_TYPE=Release flag
The standard builder already does this.
2015-08-27 10:54:10 +02:00
ts468 b1db014f40 Merge pull request #9462 from ts468/upstream.linphone
linphone: update linphone with dependencies
2015-08-26 22:33:56 +02:00
Thomas Strobel 74ce1df8f5 openh264: fix license 2015-08-26 22:24:05 +02:00
Thomas Strobel e8aa031d69 mediastreamer-openh264: init at 1.0.0 2015-08-26 22:16:28 +02:00
Thomas Strobel dbd3584590 mediastreamer: introduce environment variable to set plugins directory 2015-08-26 22:15:31 +02:00
Luca Bruno 1dc71534b4 rocksdb: disable on i686 (ZHF) 2015-08-26 18:48:51 +02:00
Thomas Strobel 444b8484d7 openh246: init at 1.4.0 2015-08-26 17:42:13 +02:00
Benno Fünfstück 0d6d5c907e cwiid: new package 2015-08-26 17:36:25 +02:00
Benno Fünfstück a5e28d5319 freenect: add version 0.5.2 2015-08-26 17:35:32 +02:00
Thomas Strobel c35309ff0b ortp: 0.24.2 -> 0.24.2 2015-08-26 17:19:19 +02:00
Thomas Strobel 1d2632f820 mediastreamer: 2.11.1 -> 2.11.2 2015-08-26 17:18:53 +02:00
Thomas Strobel 46de943ec7 belle-sip: 1.4.0 -> 1.4.1 2015-08-26 17:18:28 +02:00
Bjørn Forsman d61c46c1bd libqglviewer: rename attrname and pkgname from libQGLViewer
Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
2015-08-26 16:50:55 +02:00
Bjørn Forsman b4d8bb5626 libqglviewer: update meta attributes (and add platforms) 2015-08-26 16:50:55 +02:00
Bjørn Forsman f3fb580f65 libqglviewer: 2.3.4 -> 2.6.3
It seems upstream no longer provides old downloads. So this unbreaks the
build.
2015-08-26 16:50:55 +02:00
Edward Tjörnhammar 274f7bc117 catch: 1.1-3 -> 1.2.1 2015-08-26 12:59:57 +02:00
lethalman 46105f7d18 Merge pull request #9237 from NixOS/remove-unreferenced-files
Remove unreferenced files
2015-08-26 11:06:00 +02:00
Daniel Fox Franke 617a158e3c libb2: init at 0.97 2015-08-25 14:25:05 -04:00
Domen Kožar e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Thomas Tuegel 33f287380b Merge pull request #9294 from dezgeg/pr-pixman-arm
pixman: Enable '--disable-arm-iwmmxt' on ARM
2015-08-24 14:39:13 -05:00
Kosyrev Serge d8b3c4c49c openwsman init at 2.6.0 2015-08-24 22:34:15 +03:00
Kosyrev Serge 90f40408c8 sblim-sfcc init at 2.2.9 2015-08-24 22:34:07 +03:00
devhell fee4fe1b5e {lib}mediainfo{-gui}: 0.7.75 -> 0.7.76
From the changelog:
```
Version 0.7.76, 2015-08-06

+ XML output: line breaks and indents in between attributes for readability
+ Trace feature: XML trace update, only if compiled with trace feature
+ Amazon S3 support (REST API v2), CLI/DLL only and if compiled with
  libcurl support
+ FFV1: improved slice analysis (currently activated only with trace
  feature and for 1st frame)
x MXF: optimization of the parsing, reading a lot less data (e.g. can be
  reduced from 1 GB to 10 MB with some UHD files)
x MXF: wrong frame count with files not having the video stream as the
  first stream
x Dolby E in MPEG-TS: "SMPTE ST 302" information was accidentally removed
x MPEG-TS: avoid filling delay from file name, not applicable on MPEG-TS
x MXF: better handling of huge padding blocks, better handling of
  descriptors without link to a TrackID
x IMX: streams claiming that they are IMX are actually pure MPEG Video,
  probing both IMX and MPEG Video

```
2015-08-24 07:29:49 +02:00
Ian Duncan 4bdcf1fa95 mongoc: init at 1.1.10
[Bjørn: Minor coding style cleanup.]
2015-08-24 07:25:18 +02:00
Ian Duncan fd7144e455 libbson: init at 1.1.10
[Bjørn: Remove trailing dot in description and unneeded parenthesis
around mkDerivation arguments.]
2015-08-24 07:14:24 +02:00
Thomas Tuegel b5b78eaf44 qt54: create share/ in setupHook 2015-08-23 14:29:09 -05:00
Thomas Tuegel 4098e79378 qt54: set documentation path in setupHook 2015-08-23 13:47:24 -05:00
Thomas Tuegel 90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Thomas Tuegel e40579d91e qt54: set runtime env vars during build for makeWrapper
Set QT_PLUGIN_PATH, QML_IMPORT_PATH, and QML2_IMPORT_PATH during build
so that Qt programs may easily be wrapped for use outside NixOS. The
paths are set appropriately for the dependencies of the package.
2015-08-23 10:16:21 -05:00
Bjørn Forsman 019a23db3e qt5: specify docdir
Due to a bug somewhere, the qt documentation is by default placed in
$out/share/doc although "qmake -query" reports $out/doc. That
discrepancy causes qtcreator withDocumentation builds to fail. This
fixes it.
2015-08-23 09:56:09 +02:00
Bjørn Forsman c2a8e5e609 qt53: sync plugin/import/qml dirs with qt54
It seems like a sensible thing to keep these in sync.
2015-08-23 09:56:09 +02:00
Vladimír Čunát c250748a54 mesa: maintenance update 10.6.4 -> 10.6.5
Currently we have lots of failures on the branch,
most of them look unreproducible, and Hydra is idling.
2015-08-22 15:12:22 +02:00
William A. Kennington III 64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Eelco Dolstra e1fe23a4be libevent: Use fetchurl 2015-08-21 15:28:30 +02:00
Eelco Dolstra b1104d6082 gdk-pixbuf: Disable tests
The tests take an excessive amount of time (> 1.5 hours) and memory (>
6 GB).

http://hydra.nixos.org/build/24911713
http://hydra.nixos.org/build/24470055#tabs-buildsteps
2015-08-21 12:56:55 +02:00
William A. Kennington III b5d599af8c nss: 3.19.3 -> 3.20 2015-08-20 15:32:47 -07:00
William A. Kennington III 8aece3d1ee nspr: 4.10.8 -> 4.10.9 2015-08-20 15:32:47 -07:00
William A. Kennington III 2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Vladimír Čunát d911cc8d63 harfbuzz: minor update 1.0.1 -> 1.0.2 2015-08-20 15:21:20 +02:00
Vladimír Čunát 3f1fa380b2 gdk-pixbuf: fix CVE-2015-4491 by maintenance update 2015-08-20 15:18:46 +02:00
Bjørn Forsman ac8f2391f3 pcl: 1.6.0 -> 1.7.2 (unbreaks build)
New deps added: libXt (required), libpcap (optional).

Releases are now at github.
2015-08-20 07:45:37 +02:00
William A. Kennington III 901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
William A. Kennington III 62b589a54f libressl: 2.2.1 -> 2.2.2 2015-08-19 10:42:55 -07:00