public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch master into staging

Browse Source
This commit is contained in:
Eric Seidel
2015-04-06 18:58:08 -07:00
parent 04e39bdb5c 812d8f9fa6
commit 6ec373d776
430 changed files with 8926 additions and 4887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
pkgs/development/libraries/aalib/darwin.patch Normal file
View File

@@ -0,0 +1,106 @@
diff --git a/src/aaedit.c b/src/aaedit.c
index 09534d2..2ea52f9 100644
--- a/src/aaedit.c
+++ b/src/aaedit.c
@@ -1,6 +1,6 @@
#include <string.h>
#include <ctype.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
static void aa_editdisplay(struct aa_edit *e)
diff --git a/src/aakbdreg.c b/src/aakbdreg.c
index def65fe..f4f8efb 100644
--- a/src/aakbdreg.c
+++ b/src/aakbdreg.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aalib.c b/src/aalib.c
index 11fecc8..e3063b4 100644
--- a/src/aalib.c
+++ b/src/aalib.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aamoureg.c b/src/aamoureg.c
index 0380828..bb55fe3 100644
--- a/src/aamoureg.c
+++ b/src/aamoureg.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aarec.c b/src/aarec.c
index 70f4ebc..ee43e8a 100644
--- a/src/aarec.c
+++ b/src/aarec.c
@@ -1,5 +1,5 @@
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
diff --git a/src/aaregist.c b/src/aaregist.c
index 54abec0..765155e 100644
--- a/src/aaregist.c
+++ b/src/aaregist.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aax.c b/src/aax.c
index adcbd82..36e3294 100644
--- a/src/aax.c
+++ b/src/aax.c
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
diff --git a/src/aaxkbd.c b/src/aaxkbd.c
index 30d5903..da2248d 100644
--- a/src/aaxkbd.c
+++ b/src/aaxkbd.c
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
diff --git a/src/aaxmouse.c b/src/aaxmouse.c
index 9935b03..7e725ad 100644
--- a/src/aaxmouse.c
+++ b/src/aaxmouse.c
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
diff --git a/aalib.m4 b/aalib.m4
index c40b8db..991fbda 100644
--- a/aalib.m4
+++ b/aalib.m4
@@ -9,7 +9,7 @@
dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
dnl
-AC_DEFUN(AM_PATH_AALIB,
+AC_DEFUN([AM_PATH_AALIB],
[dnl
dnl Get the cflags and libraries from the aalib-config script
dnl

2
pkgs/development/libraries/aalib/default.nix
View File

@@ -17,6 +17,8 @@ stdenv.mkDerivation {
configureFlags = "--without-x --with-ncurses=${ncurses}";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
meta = {
description = "ASCII art graphics library";
};

0
pkgs/development/libraries/agda/AgdaSheaves/default.nix → pkgs/development/libraries/agda/Agda-Sheaves/default.nix
View File

36
pkgs/development/libraries/agda/TotalParserCombinators/contextfile
View File

@@ -1,6 +1,42 @@
Context:
[Updated the code in response to changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181310
Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07
]
[Rolled back most of "Updated the code in response to changes to Agda".
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101420
Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb
* One of the Agda changes has been reverted.
]
[Removed an outdated comment.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217162945
Ignore-this: 3ff7732335750305fe220e65693f0cbf
]
[Added the simplification "nonempty (return x) → fail".
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161718
Ignore-this: 56ad6a68c314446d8986a8c1b49655d0
]
[Added Nonempty.nonempty-return.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161629
Ignore-this: 68829d3f9a248272c46848daa05ccfe3
]
[Updated the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212154744
Ignore-this: 3410a12ca1f9de825b00e692b136d500
]
[Updated the code in response to changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212152207
Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204
]
[Updated the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223227
Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e

4
pkgs/development/libraries/agda/TotalParserCombinators/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, agda, fetchdarcs, AgdaStdlib }:
agda.mkDerivation (self: rec {
version = "2014-11-28";
version = "2015-03-19";
name = "TotalParserCombinators-${version}";
src = fetchdarcs {
url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/";
context = ./contextfile;
sha256 = "03fjrgj0749929h5zz6yfz5x9h7fln95c8ydrm44550350n4xjvk";
sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj";
};
buildDepends = [ AgdaStdlib ];

27
pkgs/development/libraries/agda/agda-stdlib/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, agda, fetchgit, ghcWithPackages }:
agda.mkDerivation (self: rec {
version = "2.4.2.3";
name = "agda-stdlib-${version}";
src = fetchgit {
url = "git://github.com/agda/agda-stdlib";
rev = "451446c5d849b8c5d6d34363e3551169eb126cfb";
sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701";
};
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
preConfigure = ''
runhaskell GenerateEverything.hs
'';
topSourceDirectories = [ "src" ];
meta = with stdenv.lib; {
homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
description = "A standard library for use with the Agda compiler";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ jwiegley fuuzetsu ];
};
})

26
pkgs/development/libraries/agda/pretty/contextfile
View File

@@ -1,6 +1,32 @@
Context:
[Updated the code in response to a change to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181428
Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0
]
[Rolled back most of "Updated the code in response to changes to Agda".
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101413
Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c
* One of the Agda changes has been reverted.
]
[Updated the code in response to changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217101656
Ignore-this: a12921aebbe0fb575ef391ba5789a391
]
[Modified the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150213144338
Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062
]
[Restored Grammar.Abstract and Grammar.Non-terminal.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727225031
Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1
]
[Modified the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128164015
Ignore-this: b9c6dddc965738aa2a7670c4c18da67f

4
pkgs/development/libraries/agda/pretty/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, agda, fetchdarcs, AgdaStdlib }:
agda.mkDerivation (self: rec {
version = "2014-11-28";
version = "2015-03-19";
name = "pretty-${version}";
src = fetchdarcs {
url = "http://www.cse.chalmers.se/~nad/repos/pretty/";
context = ./contextfile;
sha256 = "1y896qqlfjqvpd09cp0x9nhr60ii21f5cibl0v73xl3z2d0wn0xa";
sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0";
};
buildDepends = [ AgdaStdlib ];

4
pkgs/development/libraries/asio/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, boost, openssl}:
stdenv.mkDerivation rec {
name = "asio-1.10.4";
name = "asio-1.10.6";
src = fetchurl {
url = "mirror://sourceforge/asio/${name}.tar.bz2";
sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri";
sha256 = "0phr6zq8z78dwhhzs3h27q32mcv1ffg2gyq880rw3xmilx01rmz0";
};
propagatedBuildInputs = [ boost ];

2
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
intltool dbus_glib at_spi2_core libSM ];
meta = with stdenv.lib; {
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/at-spi2-core/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl";
meta = with stdenv.lib; {
platforms = platforms.linux;
platforms = platforms.unix;
};
}

6
pkgs/development/libraries/babl/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "babl-0.1.10";
name = "babl-0.1.12";
src = fetchurl {
url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4";
url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g";
};
meta = {

4
pkgs/development/libraries/botan/unstable.nix
View File

@@ -2,7 +2,7 @@
callPackage ./generic.nix (args // {
baseVersion = "1.11";
revision = "15";
sha256 = "1rkv84v09llbxyvh33szi7zsjm19l02j7h60n9g7jhhc2w667jk0";
revision = "16";
sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3";
openssl = null;
})

26
pkgs/development/libraries/ctdb/default.nix
View File

@@ -1,26 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "ctdb-2.5.4";
src = fetchurl {
url = "mirror://samba/ctdb/${name}.tar.gz";
sha256 = "09fb29ngxnh1crsqchykg23bl6s4fifvxwq4gwg1y742mmnjp9fy";
};
buildInputs = [ ];
meta = with stdenv.lib; {
description = "The trivial database";
longDescription =
'' TDB is a Trivial Database. In concept, it is very much like GDBM,
and BSD's DB except that it allows multiple simultaneous writers and
uses locking internally to keep writers from trampling on each
other. TDB is also extremely small.
'';
homepage = http://tdb.samba.org/;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;
};
}

10
pkgs/development/libraries/dbus/default.nix
View File

@@ -1,6 +1,10 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
, expat, systemd, glib, dbus_glib, python
, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
assert x11Support -> libX11 != null
&& libICE != null
&& libSM != null;
let
version = "1.8.16";
@@ -8,7 +12,7 @@ let
inherit (stdenv) lib;
buildInputsX = lib.optionals useX11 [ libX11 libICE libSM ];
buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ];
# also other parts than "libs" need this statically linked lib
makeInternalLib = "(cd dbus && make libdbus-internal.la)";
@@ -57,7 +61,7 @@ let
"--sysconfdir=/etc"
"--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
] ++ lib.optional (!useX11) "--without-x";
] ++ lib.optional (!x11Support) "--without-x";
enableParallelBuilding = true;

143
pkgs/development/libraries/ffmpeg/generic.nix
View File

@@ -64,17 +64,17 @@
, freetype ? null # Needed for drawtext filter
, frei0r ? null # frei0r video filtering
, fribidi ? null # Needed for drawtext filter
, game-music-emu ? null # Game Music Emulator
#, game-music-emu ? null # Game Music Emulator
, gnutls ? null
, gsm ? null # GSM de/encoder
#, gsm ? null # GSM de/encoder
#, ilbc ? null # iLBC de/encoder
, jack2 ? null # Jack audio (only version 2 is supported in this build)
#, jack2 ? null # Jack audio (only version 2 is supported in this build)
, ladspaH ? null # LADSPA audio filtering
, lame ? null # LAME MP3 encoder
, libass ? null # (Advanced) SubStation Alpha subtitle rendering
, libbluray ? null # BluRay reading
, libbs2b ? null # bs2b DSP library
, libcaca ? null # Textual display (ASCII art)
#, libcaca ? null # Textual display (ASCII art)
#, libcdio-paranoia ? null # Audio CD grabbing
, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394)
, libiconv ? null
@@ -100,10 +100,10 @@
, libXv ? null # Xlib support
, lzma ? null # xz-utils
#, nvenc ? null # NVIDIA NVENC support
, openal ? null # OpenAL 1.1 capture support
#, openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code
#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
, opencv ? null # Video filtering
#, opencv ? null # Video filtering
, openglExtlib ? false, mesa ? null # OpenGL rendering
#, openh264 ? null # H.264/AVC encoder
, openjpeg_1 ? null # JPEG 2000 de/encoder
@@ -127,9 +127,9 @@
, x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy)
, x264 ? null # H.264/AVC encoder
, x265 ? null # H.265/HEVC encoder
, xavs ? null # AVS encoder
#, xavs ? null # AVS encoder
, xvidcore ? null # Xvid encoder, native encoder exists
, zeromq4 ? null # Message passing
#, zeromq4 ? null # Message passing
, zlib ? null
#, zvbi ? null # Teletext support
/*
@@ -156,14 +156,19 @@
*
* Packages with errors:
* flite ilbc schroedinger
* opencv - circular dependency issue
*
* Not packaged:
* aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
* libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
*
* Need fixes to support Darwin:
* frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
* pulseaudio, rtmpdump, samba, vit-stab, wavpack, x265. xavs
*
* Not supported:
* stagehright-h264(android only)
* stagefright-h264(android only)
*
* Known issues:
* 0.5 - libgsm: configure fails to find library (fix: disable for 0.5)
@@ -203,7 +208,12 @@ let
# Flag change between versions (e.g. "--enable-armvfp" -> "--enable-vfp" changed in v1.1)
chgFlg = chgVer: oldFlag: newFlag: if reqMin chgVer then newFlag else oldFlag;
# Disable dependency that needs fixes before it will work on Darwin
disDarwinFix = origArg: if stdenv.isDarwin then false else origArg;
isCygwin = stdenv.isCygwin;
isDarwin = stdenv.isDarwin;
isLinux = stdenv.isLinux;
in
/*
@@ -239,38 +249,26 @@ assert avdeviceLibrary && reqMin "0.6" -> avformatLibrary
&& avutilLibrary; # configure flag since 0.6
assert avformatLibrary && reqMin "0.6" -> avcodecLibrary && avutilLibrary; # configure flag since 0.6
assert avresampleLibrary && reqMin "0.11" -> avutilLibrary;
assert postprocLibrary && reqMin "0.5" -> gplLicensing && avutilLibrary;
assert postprocLibrary && reqMin "0.5" -> avutilLibrary;
assert swresampleLibrary && reqMin "0.9" -> soxr != null;
assert swscaleLibrary && reqMin "0.5" -> avutilLibrary;
/*
* External libraries
*/
#assert aacplusExtlib && reqMin "0.7" -> nonfreeLicensing;
#assert cdio-paranoia != null && reqMin "0.9" -> gplLicensing;
#assert decklinkExtlib && reqMin "2.2" -> blackmagic-design-desktop-video != null
# && !isCygwin && multithreadBuild # POSIX threads required
# && nonfreeLicensing;
assert faacExtlib && reqMin "0.5" -> faac != null && nonfreeLicensing;
assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && gplLicensing && nonfreeLicensing;
assert frei0r != null && reqMin "0.7" -> gplLicensing;
assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && nonfreeLicensing;
assert gnutls != null && reqMin "0.9" -> !opensslExtlib;
assert libxcb-shmExtlib && reqMin "2.5" -> libxcb != null;
assert libxcb-xfixesExtlib && reqMin "2.5" -> libxcb != null;
assert libxcb-shapeExtlib && reqMin "2.5" -> libxcb != null;
#assert opencore-amr != null && reqMin "0.5" -> version3Licensing;
assert openglExtlib && reqMin "2.2" -> mesa != null;
assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && gplLicensing && nonfreeLicensing;
assert sambaExtlib && reqMin "2.3" -> samba != null && gplLicensing && version3Licensing;
#assert utvideo != null && reqMin "0.9" -> gplLicensing;
assert vid-stab != null && reqMin "2.0" -> gplLicensing;
#assert vo-aacenc != null && reqMin "0.6" -> version3Licensing;
#assert vo-amrwbenc != null && reqMin "0.7" -> version3Licensing;
assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null && gplLicensing;
assert x264 != null && reqMin "0.5" -> gplLicensing;
assert x265 != null && reqMin "2.2" -> gplLicensing;
assert xavs != null && reqMin "0.7" -> gplLicensing;
assert xvidcore != null && reqMin "0.5" -> gplLicensing;
#assert zvbi != null && reqMin "2.1" -> gplLicensing;
assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && nonfreeLicensing;
assert sambaExtlib && reqMin "2.3" -> samba != null && !isDarwin;
assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null;
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -295,9 +293,10 @@ stdenv.mkDerivation rec {
/*
* Build flags
*/
# One some ARM platforms --enable-thumb
# On some ARM platforms --enable-thumb
"--enable-shared --disable-static"
(mkFlag true "0.6" "pic")
(if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null)
(mkFlag smallBuild "0.5" "small")
(mkFlag runtime-cpudetectBuild "0.5" "runtime-cpudetect")
(mkFlag grayBuild "0.5" "gray")
@@ -334,7 +333,7 @@ stdenv.mkDerivation rec {
(mkFlag avformatLibrary "0.6" "avformat")
(mkFlag avresampleLibrary "1.0" "avresample")
(mkFlag avutilLibrary "1.1" "avutil")
(mkFlag postprocLibrary "0.5" "postproc")
(mkFlag (postprocLibrary && gplLicensing) "0.5" "postproc")
(mkFlag swresampleLibrary "0.9" "swresample")
(mkFlag swscaleLibrary "0.5" "swscale")
/*
@@ -359,18 +358,18 @@ stdenv.mkDerivation rec {
#(mkFlag decklinkExtlib "2.2" "decklink")
(mkFlag faacExtlib "0.5" "libfaac")
(depFlag faad2Extlib "0.5" "0.6" "libfaad")
(mkFlag fdk-aacExtlib "1.0" "libfdk-aac")
(mkFlag (fdk-aacExtlib && gplLicensing) "1.0" "libfdk-aac")
#(mkFlag (flite != null) "1.0" "libflite")
(if reqMin "1.0" then # Force disable until a solution is found
"--disable-libflite"
else null)
(mkFlag (fontconfig != null) "1.0" "fontconfig")
(mkFlag (freetype != null) "0.7" "libfreetype")
(mkFlag (frei0r != null) "0.7" "frei0r")
(mkFlag (disDarwinFix (frei0r != null && gplLicensing)) "0.7" "frei0r")
(mkFlag (fribidi != null) "2.3" "libfribidi")
(mkFlag (game-music-emu != null) "2.2" "libgme")
#(mkFlag (disDarwinFix (game-music-emu != null)) "2.2" "libgme")
(mkFlag (gnutls != null) "0.9" "gnutls")
(verFix (mkFlag (gsm != null) "0.5" "libgsm") "0.5" "--disable-libgsm")
#(verFix (mkFlag (disDarwinFix (gsm != null)) "0.5" "libgsm") "0.5" "--disable-libgsm")
#(mkFlag (ilbc != null) "1.0" "libilbc")
(mkFlag (ladspaH !=null) "2.1" "ladspa")
(mkFlag (lame != null) "0.5" "libmp3lame")
@@ -378,21 +377,21 @@ stdenv.mkDerivation rec {
#(mkFlag (libavc1394 != null) null null)
(mkFlag (libbluray != null) "1.0" "libbluray")
(mkFlag (libbs2b != null) "2.3" "libbs2b")
(mkFlag (libcaca != null) "1.0" "libcaca")
#(mkFlag (cdio-paranoia != null) "0.9" "libcdio")
(mkFlag (libdc1394 != null && libraw1394 != null) "0.5" "libdc1394")
#(mkFlag (libcaca != null) "1.0" "libcaca")
#(mkFlag (cdio-paranoia != null && gplLicensing) "0.9" "libcdio")
(mkFlag (if !isLinux then false else libdc1394 != null && libraw1394 != null && isLinux) "0.5" "libdc1394")
(mkFlag (libiconv != null) "1.2" "iconv")
#(mkFlag (libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883")
#(mkFlag (if !isLinux then false else libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883")
#(mkFlag (libmfx != null) "2.6" "libmfx")
(mkFlag (libmodplug != null) "0.9" "libmodplug")
(mkFlag (disDarwinFix (libmodplug != null)) "0.9" "libmodplug")
#(mkFlag (libnut != null) "0.5" "libnut")
(mkFlag (libopus != null) "1.0" "libopus")
(mkFlag (libssh != null) "2.1" "libssh")
(mkFlag (disDarwinFix (libssh != null)) "2.1" "libssh")
(mkFlag (libtheora != null) "0.5" "libtheora")
(mkFlag (libva != null) "0.6" "vaapi")
(mkFlag (if isDarwin then false else libva != null) "0.6" "vaapi")
(mkFlag (libvdpau != null) "0.5" "vdpau")
(mkFlag (libvorbis != null) "0.5" "libvorbis")
(mkFlag (libvpx != null) "0.6" "libvpx")
(mkFlag (disDarwinFix (libvpx != null)) "0.6" "libvpx")
(mkFlag (libwebp != null) "2.2" "libwebp")
(mkFlag (libX11 != null && libXv != null) "2.3" "xlib")
(mkFlag (libxcb != null) "2.5" "libxcb")
@@ -401,39 +400,38 @@ stdenv.mkDerivation rec {
(mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape")
(mkFlag (lzma != null) "2.4" "lzma")
#(mkFlag nvenc "2.6" "nvenc")
(mkFlag (openal != null) "0.9" "openal")
#(mkFlag (disDarwinFix (openal != null)) "0.9" "openal")
#(mkFlag opencl "2.2" "opencl")
#(mkFlag (opencore-amr != null) "0.5" "libopencore-amrnb")
#(mkFlag (opencore-amr != null) "0.5" "libopencore-amrwb")
(mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7
#(mkFlag (opencore-amr != null && version3Licensing) "0.5" "libopencore-amrnb")
#(mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7
(mkFlag openglExtlib "2.2" "opengl")
#(mkFlag (openh264 != null) "2.6" "openh264")
(mkFlag (openjpeg_1 != null) "0.5" "libopenjpeg")
(mkFlag opensslExtlib "0.9" "openssl")
(mkFlag (pulseaudio != null) "0.9" "libpulse")
(mkFlag (disDarwinFix (openjpeg_1 != null)) "0.5" "libopenjpeg")
(mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl")
(mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse")
#(mkFlag quvi "2.0" "libquvi")
(mkFlag (rtmpdump != null) "0.6" "librtmp")
(mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp")
#(mkFlag (schroedinger != null) "0.5" "libschroedinger")
#(mkFlag (shine != null) "2.0" "libshine")
(mkFlag sambaExtlib "2.3" "libsmbclient")
(mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient")
(mkFlag (SDL != null) "2.5" "sdl") # Only configurable since 2.5, auto detected before then
(mkFlag (soxr != null) "1.2" "libsoxr")
(mkFlag (speex != null) "0.5" "libspeex")
#(mkFlag (twolame != null) "1.0" "libtwolame")
#(mkFlag (utvideo != null) "0.9" "libutvideo")
(mkFlag (v4l_utils != null) "0.9" "libv4l2")
(mkFlag (vid-stab != null) "2.2" "libvidstab") # Actual min. version 2.0
#(mkFlag (vo-aacenc != null) "0.6" "libvo-aacenc")
#(mkFlag (vo-amrwbenc) "0.7" "libvo-amrwbenc")
(mkFlag (wavpack != null) "2.0" "libwavpack")
(mkFlag (x11grabExtlib) "0.5" "x11grab")
(mkFlag (x264 != null) "0.5" "libx264")
(mkFlag (x265 != null) "2.2" "libx265")
(mkFlag (xavs != null) "0.7" "libxavs")
(mkFlag (xvidcore != null) "0.5" "libxvid")
(mkFlag (zeromq4 != null) "2.0" "libzmq")
#(mkFlag (utvideo != null && gplLicensing) "0.9" "libutvideo")
#(mkFlag (if !isLinux then false else v4l_utils != null && isLinux) "0.9" "libv4l2")
(mkFlag (disDarwinFix (vid-stab != null && gplLicensing)) "2.2" "libvidstab") # Actual min. version 2.0
#(mkFlag (vo-aacenc != null && version3Licensing) "0.6" "libvo-aacenc")
#(mkFlag (vo-amrwbenc != null && version3Licensing) "0.7" "libvo-amrwbenc")
(mkFlag (disDarwinFix (wavpack != null)) "2.0" "libwavpack")
(mkFlag (x11grabExtlib && gplLicensing) "0.5" "x11grab")
(mkFlag (x264 != null && gplLicensing) "0.5" "libx264")
(mkFlag (disDarwinFix (x265 != null && gplLicensing)) "2.2" "libx265")
#(mkFlag (disDarwinFix (xavs != null && gplLicensing)) "0.7" "libxavs")
(mkFlag (xvidcore != null && gplLicensing) "0.5" "libxvid")
#(mkFlag (zeromq4 != null) "2.0" "libzmq")
(mkFlag (zlib != null) "0.5" "zlib")
#(mkFlag (zvbi != null) "2.1" "libzvbi")
#(mkFlag (zvbi != null && gplLicensing) "2.1" "libzvbi")
/*
* Developer flags
*/
@@ -449,14 +447,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
buildInputs = [
alsaLib bzip2 celt faad2 fdk_aac fontconfig freetype frei0r fribidi
game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b
libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora
libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes
libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump
samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore
zeromq4 zlib
] ++ optional faacExtlib faac;
bzip2 celt fontconfig freetype fribidi gnutls ladspaH lame libass libbluray
libbs2b /* libcaca */ libdc1394 libogg libopus libtheora libvdpau libvorbis
libwebp libX11 libxcb libXext libXfixes libXv lzma SDL soxr speex x264
xvidcore /* zeromq4 */ zlib
] ++ optional (disDarwinFix sambaExtlib) samba
++ optional openglExtlib mesa
++ optionals x11grabExtlib [ libXext libXfixes ]
++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ]
++ optionals (!isDarwin) [
frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */
openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */
] ++ optional (!isDarwin && !isCygwin) libva
++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ];
# Build qt-faststart executable
buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart'';

14
pkgs/development/libraries/garmintools/default.nix Normal file
View File

@@ -0,0 +1,14 @@
{ stdenv, fetchurl, libusb }:
stdenv.mkDerivation {
name = "garmintools-0.10";
src = fetchurl {
url = https://garmintools.googlecode.com/files/garmintools-0.10.tar.gz;
sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz";
};
buildInputs = [ libusb ];
meta = {
homepage = https://code.google.com/p/garmintools;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.ocharles ];
};
}

8
pkgs/development/libraries/gdal/default.nix
View File

@@ -1,5 +1,6 @@
{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl }:
, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
, libpng }:
composableDerivation.composableDerivation {} (fixed: rec {
version = "1.11.2";
@@ -10,7 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
};
buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj openssl ];
buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
# Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
# Unset CC and CXX as they confuse libtool.
@@ -19,10 +20,11 @@ composableDerivation.composableDerivation {} (fixed: rec {
configureFlags = [
"--with-jpeg=${libjpeg}"
"--with-libtiff=${libtiff}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional
"--with-libz=${zlib}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql}/bin/mysql_config"
"--with-mysql=${mysql.lib}/bin/mysql_config"
"--with-geotiff=${libgeotiff}"
"--with-python" # optional
"--with-static-proj4=${proj}" # optional

6
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@@ -2,15 +2,15 @@
, jasper, libintlOrEmpty, gobjectIntrospection }:
let
ver_maj = "2.30";
ver_min = "8";
ver_maj = "2.31";
ver_min = "3";
in
stdenv.mkDerivation rec {
name = "gdk-pixbuf-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
sha256 = "1gpqpskp4zzf7h35bp247jcvnk6rxc52r69pb11v8g8i2q386ls8";
sha256 = "ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc";
};
setupHook = ./setup-hook.sh;

2
pkgs/development/libraries/gegl/default.nix
View File

@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
# needs fonts otherwise don't know how to pass them
configureFlags = "--disable-docs";
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ];
nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/gnome-sharp/default.nix
View File

@@ -12,6 +12,8 @@ stdenv.mkDerivation {
patches = [ ./Makefile.in.patch ];
dontStrip = true;
meta = with stdenv.lib; {
homepage = http://www.mono-project.com/docs/gui/gtksharp/;
description = "A .NET language binding for assorted GNOME libraries";

72
pkgs/development/libraries/gnutls/3.2.nix
View File

@@ -1,70 +1,10 @@
{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp }:
{ callPackage, fetchurl, ... } @ args:
assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-3.2.20";
callPackage ./generic.nix (args // rec {
version = "3.2.21";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
sha256 = "0mjwzj486g0aj5i3zr70mixmbd4ldrj1ckrwmcr90si6bqa0sc6q";
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.lz";
sha256 = "1xydzlwmf0frxvr26yw0ily5vwkdvf90m53fix61bi5gx4xd2m7m";
};
patches =
# FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch
;
# Note: GMP is a dependency of Nettle, whose public headers include
# GMP headers, hence the hack.
configurePhase = ''
./configure --prefix="$out" \
--disable-dependency-tracking --enable-fast-install \
--without-p11-kit \
--with-lzo --with-libtasn1-prefix="${libtasn1}" \
--with-libnettle-prefix="${nettle}" \
CPPFLAGS="-I${gmp}/include" \
${stdenv.lib.optionalString guileBindings
"--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""}
'';
# Build of the Guile bindings is not parallel-safe. See
# <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
# for the actual fix.
enableParallelBuilding = !guileBindings;
buildInputs = [ zlib lzo lzip ]
++ stdenv.lib.optional guileBindings guile;
nativeBuildInputs = [ perl pkgconfig ];
propagatedBuildInputs = [ nettle libtasn1 ];
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
meta = {
description = "The GNU Transport Layer Security Library";
longDescription = ''
GnuTLS is a project that aims to develop a library which
provides a secure layer, over a reliable transport
layer. Currently the GnuTLS library implements the proposed
standards by the IETF's TLS working group.
Quoting from the TLS protocol specification:
"The TLS protocol provides communications privacy over the
Internet. The protocol allows client/server applications to
communicate in a way that is designed to prevent eavesdropping,
tampering, or message forgery."
'';
homepage = http://www.gnu.org/software/gnutls/;
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
};
}
})

10
pkgs/development/libraries/gnutls/3.3.nix Normal file
View File

@@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3.14";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
sha256 = "1117j71ng66syddw10yazrniqkd326hcigx2hfcw4s86rk0kqanv";
};
})

71
pkgs/development/libraries/gnutls/generic.nix Normal file
View File

@@ -0,0 +1,71 @@
{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, guileBindings, guile, perl, gmp
# Version dependent args
, version, src
, ...}:
assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-${version}";
inherit src;
patches =
# FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch
;
# Note: GMP is a dependency of Nettle, whose public headers include
# GMP headers, hence the hack.
configurePhase = ''
./configure --prefix="$out" \
--disable-dependency-tracking --enable-fast-install \
--without-p11-kit \
--with-lzo --with-libtasn1-prefix="${libtasn1}" \
--with-libnettle-prefix="${nettle}" \
CPPFLAGS="-I${gmp}/include" \
${stdenv.lib.optionalString guileBindings
"--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""}
'';
# Build of the Guile bindings is not parallel-safe. See
# <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
# for the actual fix.
enableParallelBuilding = !guileBindings;
buildInputs = [ zlib lzo lzip ]
++ stdenv.lib.optional guileBindings guile;
nativeBuildInputs = [ perl pkgconfig ];
propagatedBuildInputs = [ nettle libtasn1 ];
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
meta = with stdenv.lib; {
description = "The GNU Transport Layer Security Library";
longDescription = ''
GnuTLS is a project that aims to develop a library which
provides a secure layer, over a reliable transport
layer. Currently the GnuTLS library implements the proposed standards by
the IETF's TLS working group.
Quoting from the TLS protocol specification:
"The TLS protocol provides communications privacy over the
Internet. The protocol allows client/server applications to
communicate in a way that is designed to prevent eavesdropping,
tampering, or message forgery."
'';
homepage = http://www.gnu.org/software/gnutls/;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ eelco wkennington ];
platforms = platforms.all;
};
}

6
pkgs/development/libraries/gtk+/3.x.nix
View File

@@ -21,12 +21,14 @@ stdenv.mkDerivation rec {
sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
buildInputs = [ libxkbcommon ];
propagatedBuildInputs = with xlibs; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
++ optionals stdenv.isLinux [ wayland ]
++ optional stdenv.isDarwin x11
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;

10
pkgs/development/libraries/gtkmm/2.x.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurlGnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
{ stdenv, fetchurl, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
stdenv.mkDerivation rec {
name = src.pkgname;
name = "gtkmm-${minVer}.4";
minVer = "2.24";
src = fetchurlGnome {
project = "gtkmm";
major = "2"; minor = "24"; patchlevel = "4"; extension = "xz";
src = fetchurl {
url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz";
sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
};

4
pkgs/development/libraries/haskell/poppler/default.nix
View File

@@ -12,6 +12,10 @@ cabal.mkDerivation (self: {
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc ];
pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ];
patchPhase = ''
sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
'';
meta = {
homepage = "http://www.haskell.org/gtk2hs/";
description = "Binding to the Poppler";

15
pkgs/development/libraries/ilmbase/bootstrap.patch Normal file
View File

@@ -0,0 +1,15 @@
diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap
--- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400
+++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400
@@ -47,11 +47,6 @@
fi
}
-# Check if /usr/local/share/aclocal exists
-if [ -d /usr/local/share/aclocal ]; then
- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal"
-fi
-
run_cmd aclocal -I m4 $ACLOCAL_INCLUDE
run_cmd $LIBTOOLIZE --automake --copy
run_cmd automake --add-missing --copy

6
pkgs/development/libraries/ilmbase/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, openexr, automake, autoconf, libtool }:
{ stdenv, openexr, automake, autoconf, libtool, which }:
stdenv.mkDerivation {
name = "ilmbase-${openexr.source.version}";
@@ -13,7 +13,9 @@ stdenv.mkDerivation {
./bootstrap
'';
buildInputs = [ automake autoconf libtool ];
buildInputs = [ automake autoconf libtool which ];
patches = [ ./bootstrap.patch ];
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;

4
pkgs/development/libraries/irrlicht/default.nix
View File

@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
};
patchPhase = ''
patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
postPatch = ''
sed -i /stdcall-alias/d source/Irrlicht/Makefile
'';

40
pkgs/development/libraries/irrlicht/irrlicht-1.8.1-mesa-10.x.patch Normal file
View File

@@ -0,0 +1,40 @@
From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
From: hiker <henrichsjoerg@mgail.com>
Date: Wed, 26 Feb 2014 11:13:03 +1100
Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
problems.
--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
+++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h
@@ -21,6 +21,7 @@
#endif
#include <GL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#endif
#include "wglext.h"
@@ -35,6 +36,7 @@
#endif
#include <OpenGL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#endif
#elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
@@ -48,6 +50,7 @@
#define NO_SDL_GLEXT
#include <SDL/SDL_video.h>
#include <SDL/SDL_opengl.h>
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#else
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
@@ -60,6 +63,7 @@
#include <GL/gl.h>
#include <GL/glx.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
#include "glxext.h"

22
pkgs/development/libraries/java/swt/default.nix
View File

@@ -6,11 +6,21 @@
, libsoup
}:
let metadata = if stdenv.system == "i686-linux"
then { arch = "x86"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }
else if stdenv.system == "x86_64-linux"
then { arch = "x86_64"; sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }
else { };
let
platformMap = {
"x86_64-linux" =
{ platform = "gtk-linux-x86_64";
sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; };
"i686-linux" =
{ platform = "gtk-linux-x86";
sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; };
"x86_64-darwin" =
{ platform = "cocoa-macosx-x86_64";
sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; };
};
metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system};
in stdenv.mkDerivation rec {
version = "3.7.2";
fullVersion = "${version}-201202080800";
@@ -22,7 +32,7 @@ in stdenv.mkDerivation rec {
# releases of SWT. So we just grab a binary release and extract
# "src.zip" from that.
src = fetchurl {
url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-gtk-linux-${metadata.arch}.zip";
url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-${metadata.platform}.zip";
sha256 = metadata.sha256;
};

3
pkgs/development/libraries/jbigkit/default.nix
View File

@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile
'' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) ''
substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \
--replace "CC = gcc" "CC = clang"
'';
installPhase = ''

15
pkgs/development/libraries/json-glib/default.nix
View File

@@ -1,18 +1,15 @@
{ stdenv, fetchurlGnome, glib, pkgconfig, gobjectIntrospection, dbus }:
{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus }:
stdenv.mkDerivation rec {
name = src.pkgname;
name = "json-glib-${minVer}.2";
minVer = "1.0";
src = fetchurlGnome {
project = "json-glib";
major = "1";
minor = "0";
patchlevel = "2";
extension = "xz";
src = fetchurl {
url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";
sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a";
};
configureflags= "--with-introspection" ;
configureflags= "--with-introspection";
propagatedBuildInputs = [ glib gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/kerberos/krb5.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
description = "MIT Kerberos 5";
homepage = webpage;
license = "MPL";
platforms = platforms.unix;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];
};

7
pkgs/development/libraries/libdbi-drivers/default.nix
View File

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
};
buildInputs = [ libdbi mysql sqlite postgresql ];
buildInputs = [ libdbi sqlite postgresql ]
++ optional (mysql != null) mysql.lib;
postPatch = ''
sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
"--with-dbi-libdir=${libdbi}/lib"
] ++ optionals (mysql != null) [
"--with-mysql"
"--with-mysql-incdir=${mysql}/include/mysql"
"--with-mysql-libdir=${mysql}/lib/mysql"
"--with-mysql-incdir=${mysql.lib}/include/mysql"
"--with-mysql-libdir=${mysql.lib}/lib/mysql"
] ++ optionals (postgresql != null) [
"--with-pgsql"
"--with-pgsql_incdir=${postgresql}/include"

8
pkgs/development/libraries/libfpx/default.nix
View File

@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233";
};
# Darwin gets misdetected as Windows without this
NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null;
# This dead code causes a duplicate symbol error in Clang so just remove it
postPatch = if (stdenv.cc.cc.isClang or false) then ''
substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
'' else null;
meta = with stdenv.lib; {
homepage = http://www.imagemagick.org;
description = "A library for manipulating FlashPIX images";

2
pkgs/development/libraries/libibverbs/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://www.openfabrics.org/;
license = licenses.bsd2;
platforms = platforms.unix;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];
};
}

7
pkgs/development/libraries/libmad/default.nix
View File

@@ -8,7 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690";
};
patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ];
patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ]
# optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
# It is included here in order to fix a build failure in Clang
# But it may be useful to fix other, currently unknown problems as well
++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) [ ./optimize.diff ];
nativeBuildInputs = [ autoconf ];
@@ -22,6 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/mad/;
description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};

77
pkgs/development/libraries/libmad/optimize.diff Normal file
View File

@@ -0,0 +1,77 @@
Index: libmad-0.15.1b/configure.ac
===================================================================
--- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:31:23.000000000 +0000
+++ libmad-0.15.1b/configure.ac 2008-03-07 20:34:26.000000000 +0000
@@ -124,71 +124,7 @@
if test "$GCC" = yes
then
- if test -z "$arch"
- then
- case "$host" in
- i386-*) ;;
- i?86-*) arch="-march=i486" ;;
- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;;
- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;;
- powerpc-*) ;;
- mips*-agenda-*) arch="-mcpu=vr4100" ;;
- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
- esac
- fi
-
- case "$optimize" in
- -O|"-O "*)
- optimize="-O"
- optimize="$optimize -fforce-mem"
- optimize="$optimize -fforce-addr"
- : #x optimize="$optimize -finline-functions"
- : #- optimize="$optimize -fstrength-reduce"
- optimize="$optimize -fthread-jumps"
- optimize="$optimize -fcse-follow-jumps"
- optimize="$optimize -fcse-skip-blocks"
- : #x optimize="$optimize -frerun-cse-after-loop"
- : #x optimize="$optimize -frerun-loop-opt"
- : #x optimize="$optimize -fgcse"
- optimize="$optimize -fexpensive-optimizations"
- optimize="$optimize -fregmove"
- : #* optimize="$optimize -fdelayed-branch"
- : #x optimize="$optimize -fschedule-insns"
- optimize="$optimize -fschedule-insns2"
- : #? optimize="$optimize -ffunction-sections"
- : #? optimize="$optimize -fcaller-saves"
- : #> optimize="$optimize -funroll-loops"
- : #> optimize="$optimize -funroll-all-loops"
- : #x optimize="$optimize -fmove-all-movables"
- : #x optimize="$optimize -freduce-all-givs"
- : #? optimize="$optimize -fstrict-aliasing"
- : #* optimize="$optimize -fstructure-noalias"
-
- case "$host" in
- arm*-*)
- optimize="$optimize -fstrength-reduce"
- ;;
- mips*-*)
- optimize="$optimize -fstrength-reduce"
- optimize="$optimize -finline-functions"
- ;;
- i?86-*)
- optimize="$optimize -fstrength-reduce"
- ;;
- powerpc-apple-*)
- # this triggers an internal compiler error with gcc2
- : #optimize="$optimize -fstrength-reduce"
-
- # this is really only beneficial with gcc3
- : #optimize="$optimize -finline-functions"
- ;;
- *)
- # this sometimes provokes bugs in gcc 2.95.2
- : #optimize="$optimize -fstrength-reduce"
- ;;
- esac
- ;;
- esac
+ optimize="-O2"
fi
case "$host" in

2
pkgs/development/libraries/libmediainfo/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Shared library for mediainfo";
homepage = http://mediaarea.net/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.devhell ];
};
}

4
pkgs/development/libraries/libmsgpack/default.nix
View File

@@ -1,12 +1,12 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "cpp-${version}";
sha256 = "0qyjz2rm0gxbv81dlh28ynss66dsyhlqzs09rblbjsdf1vh6yzcq";
sha256 = "1hnpnin6gjiilbzfd75871kamfn9grrf53qpbs061sflvz56fddq";
};
})

2
pkgs/development/libraries/librdmacm/default.nix
View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://www.openfabrics.org/;
platforms = platforms.unix;
platforms = platforms.linux;
license = licenses.bsd2;
maintainers = with maintainers; [ wkennington ];
};

4
pkgs/development/libraries/libre/default.nix
View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, zlib, openssl}:
stdenv.mkDerivation rec {
version = "0.4.11";
version = "0.4.12";
name = "libre-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
sha256 = "10jqra8b1nzy1q440ax72fxymxasgjyvpy0x4k67l77wy4p1jr42";
sha256 = "1wjdcf5wr50d86rysj5haz53v7d58j7sszpc6k5b4mn1x6604i0d";
};
buildInputs = [zlib openssl];
makeFlags = [

2
pkgs/development/libraries/librelp/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
homepage = http://www.librelp.com/;
description = "a reliable logging library";
license = licenses.gpl2;
platforms = platforms.all;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];
};
}

4
pkgs/development/libraries/libressl/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libressl-${version}";
version = "2.1.5";
version = "2.1.6";
src = fetchurl {
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
sha256 = "1fy3x5idx5mnncbzhsw1ahwnh7ram4d05ksz0ipf5x6p7y8pj8x8";
sha256 = "1a2k6sby6a1d0hf4hns6d13cvyck2i0figbkf1q0301vggcnv0jg";
};
enableParallelBuilding = true;

6
pkgs/development/libraries/librsvg/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
, bzip2, libcroco
, bzip2, libcroco, libintlOrEmpty
, gtk3 ? null
, gobjectIntrospection ? null, enableIntrospection ? false }:
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk";
};
buildInputs = [ libxml2 libgsf bzip2 libcroco pango ]
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ];

6
pkgs/development/libraries/libunwind/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, xz}:
{ stdenv, fetchurl, xz }:
stdenv.mkDerivation rec {
name = "libunwind-1.1";
@@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
touch "$out/lib/libunwind-generic.so"
'';
meta = {
meta = with stdenv.lib; {
homepage = http://www.nongnu.org/libunwind;
description = "A portable and efficient API to determine the call-chain of a program";
platforms = platforms.linux;
license = licenses.gpl2;
};
}

7
pkgs/development/libraries/libxcomp/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }:
{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
let version = "3.5.0.31"; in
stdenv.mkDerivation {
@@ -17,11 +17,10 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ];
buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ];
preConfigure = ''
preAutoreconf = ''
cd nxcomp/
autoconf
'';
enableParallelBuilding = true;

2
pkgs/development/libraries/libxml2/default.nix
View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation (rec {
name = "libxml2-${version}";
src = fetchurl {
url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
url = "http://xmlsoft.org/sources/${name}.tar.gz";
sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
};

2
pkgs/development/libraries/libxslt/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "libxslt-1.1.28";
src = fetchurl {
url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
url = "http://xmlsoft.org/sources/${name}.tar.gz";
sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
};

2
pkgs/development/libraries/libzen/default.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
description = "Shared library for libmediainfo and mediainfo";
homepage = http://mediaarea.net/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.devhell ];
};
}

13
pkgs/development/libraries/libzip/default.nix
View File

@@ -2,12 +2,21 @@
stdenv.mkDerivation rec {
name = "libzip-0.11.2";
src = fetchurl {
url = "http://www.nih.at/libzip/${name}.tar.gz";
sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3";
};
# fix CVE-2015-2331 taken from Debian patch:
# https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=libzip-0.11.2-1.2-nmu.diff;att=1;bug=780756
postPatch = ''
substituteInPlace lib/zip_dirent.c --replace \
'else if ((cd->entry=(struct zip_entry *)' \
'else if (nentry > ((size_t)-1)/sizeof(*(cd->entry)) || (cd->entry=(struct zip_entry *)'
cat lib/zip_dirent.c
'';
propagatedBuildInputs = [ zlib ];
# At least mysqlWorkbench cannot find zipconf.h; I think also openoffice

4
pkgs/development/libraries/mdds/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "0.11.2";
version = "0.12.0";
name = "mdds-${version}";
src = fetchurl {
url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
sha256 = "1ax50ahgl549gw76p8kbd5cb0kkihrn59638mppq4raxng40s2nd";
sha256 = "10ar7r0gkdl2r7916jlkl5c38cynrh7x9s90a5i8d242r8ixw8ia";
};
postInstall = ''

2
pkgs/development/libraries/mtdev/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
See the kernel documentation for further details.
'';
license = licenses.mit;
platforms = platforms.unix;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];
};
}

10
pkgs/development/libraries/nettle/27.nix Normal file
View File

@@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2.7.1";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
};
})

67
pkgs/development/libraries/nettle/default.nix
View File

@@ -1,67 +1,10 @@
{ fetchurl, stdenv, gmp, gnum4 }:
{ callPackage, fetchurl, ... } @ args:
stdenv.mkDerivation (rec {
name = "nettle-2.7.1";
callPackage ./generic.nix (args // rec {
version = "3.0";
src = fetchurl {
url = "mirror://gnu/nettle/${name}.tar.gz";
sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "04yrpjz33vrj6j0zxc153b00f93i8hs41syr1ryp7sr64fyw0lcn";
};
buildInputs = [ gnum4 ];
propagatedBuildInputs = [ gmp ];
doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin);
enableParallelBuilding = true;
# It doesn't build otherwise
dontDisableStatic = true;
patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
./cygwin.patch;
meta = {
description = "Cryptographic library";
longDescription = ''
Nettle is a cryptographic library that is designed to fit
easily in more or less any context: In crypto toolkits for
object-oriented languages (C++, Python, Pike, ...), in
applications like LSH or GNUPG, or even in kernel space. In
most contexts, you need more than the basic cryptographic
algorithms, you also need some way to keep track of available
algorithms, their properties and variants. You often have
some algorithm selection process, often dictated by a protocol
you want to implement.
And as the requirements of applications differ in subtle and
not so subtle ways, an API that fits one application well can
be a pain to use in a different context. And that is why
there are so many different cryptographic libraries around.
Nettle tries to avoid this problem by doing one thing, the
low-level crypto stuff, and providing a simple but general
interface to it. In particular, Nettle doesn't do algorithm
selection. It doesn't do memory allocation. It doesn't do any
I/O.
'';
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.lysator.liu.se/~nisse/nettle/;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
//
stdenv.lib.optionalAttrs stdenv.isSunOS {
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
configureFlags = [ "--with-include-path=${gmp}/include" ];
})

68
pkgs/development/libraries/nettle/generic.nix Normal file
View File

@@ -0,0 +1,68 @@
{ stdenv, gmp, gnum4
# Version specific args
, version, src
, ...}:
stdenv.mkDerivation (rec {
name = "nettle-${version}";
inherit src;
buildInputs = [ gnum4 ];
propagatedBuildInputs = [ gmp ];
doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin);
enableParallelBuilding = true;
# It doesn't build otherwise
dontDisableStatic = true;
patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
./cygwin.patch;
meta = {
description = "Cryptographic library";
longDescription = ''
Nettle is a cryptographic library that is designed to fit
easily in more or less any context: In crypto toolkits for
object-oriented languages (C++, Python, Pike, ...), in
applications like LSH or GNUPG, or even in kernel space. In
most contexts, you need more than the basic cryptographic
algorithms, you also need some way to keep track of available
algorithms, their properties and variants. You often have
some algorithm selection process, often dictated by a protocol
you want to implement.
And as the requirements of applications differ in subtle and
not so subtle ways, an API that fits one application well can
be a pain to use in a different context. And that is why
there are so many different cryptographic libraries around.
Nettle tries to avoid this problem by doing one thing, the
low-level crypto stuff, and providing a simple but general
interface to it. In particular, Nettle doesn't do algorithm
selection. It doesn't do memory allocation. It doesn't do any
I/O.
'';
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.lysator.liu.se/~nisse/nettle/;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
//
stdenv.lib.optionalAttrs stdenv.isSunOS {
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
configureFlags = [ "--with-include-path=${gmp}/include" ];
})

6
pkgs/development/libraries/ntdb/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, readline, libxslt
{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt
, docbook_xsl, docbook_xml_dtd_42
}:
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
};
buildInputs = [
python pkgconfig readline libxslt docbook_xsl docbook_xml_dtd_42
python pkgconfig readline gettext libxslt docbook_xsl docbook_xml_dtd_42
];
preConfigure = ''
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
patchShebangs buildtools/bin/waf
'';
configureFlags = [

13
pkgs/development/libraries/opendbx/default.nix
View File

@@ -1,17 +1,18 @@
{stdenv, fetchurl, readline, mysql, postgresql, sqlite}:
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
stdenv.mkDerivation rec {
name = "opendbx-1.4.4";
name = "opendbx-1.4.6";
src = fetchurl {
url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz";
sha256 = "1pc70l54kkdakdw8njr2pnbcghq7fn2bnk97wzhac2adwdkjp7vs";
sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2";
};
preConfigure = ''
export CPPFLAGS="-I${mysql}/include/mysql"
export LDFLAGS="-L${mysql}/lib/mysql"
export CPPFLAGS="-I${mysql.lib}/include/mysql"
export LDFLAGS="-L${mysql.lib}/lib/mysql"
configureFlagsArray=(--with-backends="mysql pgsql sqlite3")
'';
buildInputs = [readline mysql postgresql sqlite];
buildInputs = [ readline mysql.lib postgresql sqlite ];
}

15
pkgs/development/libraries/openexr/bootstrap.patch Normal file
View File

@@ -0,0 +1,15 @@
diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap
--- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400
+++ OpenEXR/bootstrap 2015-03-31 01:03:35.000000000 -0400
@@ -47,11 +47,6 @@
fi
}
-# Check if /usr/local/share/aclocal exists
-if [ -d /usr/local/share/aclocal ]; then
- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal"
-fi
-
run_cmd aclocal -I m4 $ACLOCAL_INCLUDE
run_cmd $LIBTOOLIZE --automake --copy
run_cmd automake --add-missing --copy

2
pkgs/development/libraries/openexr/default.nix
View File

@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake libtool pkgconfig ];
propagatedBuildInputs = [ ilmbase zlib ];
patches = [ ./bootstrap.patch ];
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;

3
pkgs/development/libraries/pango/default.nix
View File

@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq";
};
buildInputs = with stdenv.lib;
optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex
buildInputs = with stdenv.lib; [ gobjectIntrospection ]
++ optionals stdenv.isDarwin [ fontconfig ];
nativeBuildInputs = [ pkgconfig ];

101
pkgs/development/libraries/poppler/default.nix
View File

@@ -1,83 +1,50 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconv, libintlOrEmpty
{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, qt4Support ? false, qt4 ? null, qt5
, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null
, utils ? false, suffix ? "glib"
}:
let
version = "0.28.1"; # even major numbers are stable
sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc";
version = "0.32.0"; # even major numbers are stable
sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9";
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
# This is for Okular (and similar) to support subpixel rendering.
# It's kept from upstream because of political reasons.
qtcairo_patch = fetchpatch {
url = "https://github.com/giddie/poppler-qt4-cairo-backend/compare/"
+ "fa1d636...b30f96c.diff"; # update to current maint...qt4-lcd
sha256 = "0g18y247k2vcz1n56rnfpy226f22v4r9c7pk8cf2h9l12vz2qxkm";
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
inherit sha256;
};
poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [
rec {
name = "poppler-${nameSuff}-${version}";
patches = [ ./datadir_env.patch ];
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
inherit sha256;
};
propagatedBuildInputs = with stdenv.lib;
[ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]
++ optional qt4Support qt4
++ optional qt5Support qt5.base;
propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ];
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
nativeBuildInputs = [ pkgconfig cmake libiconv ] ++ libintlOrEmpty;
configureFlags =
[
"--enable-xpdf-headers"
"--enable-libcurl"
"--enable-zlib"
]
++ stdenv.lib.optional (!utils) "--disable-utils";
cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
enableParallelBuilding = true;
patches = [ ./datadir_env.patch ./poppler-glib.patch ];
meta = {
homepage = http://poppler.freedesktop.org/;
description = "A PDF rendering library";
# XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
# such as `../../../test/unittestcases/UseNone.pdf'.
#doCheck = !qt4Support;
checkTarget = "test";
enableParallelBuilding = true;
meta = {
homepage = http://poppler.freedesktop.org/;
description = "A PDF rendering library";
longDescription = ''
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
};
} merge ]); # poppler_drv
/* We always use cairo in poppler, so we always depend on glib,
so we always build the glib wrapper (~350kB).
We also always build the cpp wrapper (<100kB).
ToDo: around half the size could be saved by splitting out headers and tools (1.5 + 0.5 MB).
*/
poppler_glib = poppler_drv "glib" { };
poppler_qt4 = poppler_drv "qt4" {
#patches = [ qtcairo_patch ]; # text rendering artifacts in recent versions
propagatedBuildInputs = [ qt4 poppler_glib ];
NIX_LDFLAGS = "-lpoppler";
postConfigure = ''
mkdir -p "$out/lib/pkgconfig"
install -c -m 644 poppler-qt4.pc "$out/lib/pkgconfig"
cd qt4
longDescription = ''
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
'';
};
poppler_qt5 = poppler_drv "qt5" {
propagatedBuildInputs = [ qt5.base poppler_glib ];
postConfigure = ''
mkdir -p "$out/lib/pkgconfig"
install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig"
cd qt5
'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
in { inherit poppler_glib poppler_qt4 poppler_qt5; } // poppler_glib
}

19
pkgs/development/libraries/poppler/poppler-glib.patch
View File

@@ -1,19 +0,0 @@
diff -rupN a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
--- a/poppler-glib.pc.cmake 2013-08-17 01:20:41.000000001 +0200
+++ b/poppler-glib.pc.cmake 2014-01-01 09:30:50.000000001 +0100
@@ -10,4 +10,4 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go
@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-glib
-Cflags: -I${includedir}/poppler/glib
+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler
diff -rupN a/poppler-glib.pc.in b/poppler-glib.pc.in
--- a/poppler-glib.pc.in 2013-08-17 01:20:41.000000001 +0200
+++ b/poppler-glib.pc.in 2014-01-01 09:27:17.000000001 +0100
@@ -10,4 +10,5 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go
@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-glib
-Cflags: -I${includedir}/poppler/glib
+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler
+

30
pkgs/development/libraries/qca2/default.nix
View File

@@ -1,32 +1,18 @@
{ stdenv, fetchurl, which, qt4 }:
{ stdenv, fetchurl, cmake, pkgconfig, qt }:
stdenv.mkDerivation rec {
name = "qca-2.0.3";
name = "qca-2.1.0";
src = fetchurl {
url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2";
sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld";
url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz";
sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92";
};
buildInputs = [ qt4 ];
nativeBuildInputs = [ which ];
preBuild =
''
sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
'';
patches = [ ./gcc47.patch ];
configureFlags = "--no-separate-debug-info";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture";
license = "LGPL";

12
pkgs/development/libraries/qca2/gcc47.patch
View File

@@ -1,12 +0,0 @@
# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html
--- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200
+++ qca-2.0.3/src/botantools/botan/botan/secmem.h 2012-09-16 23:28:43.767480490 +0200
@@ -214,7 +214,7 @@
SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
SecureVector(const T in[], u32bit n)
- { MemoryRegion<T>::init(true); set(in, n); }
+ { MemoryRegion<T>::init(true); this->set(in, n); }
SecureVector(const MemoryRegion<T>& in)
{ MemoryRegion<T>::init(true); set(in); }
SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)

33
pkgs/development/libraries/qca2/ossl.nix
View File

@@ -1,33 +0,0 @@
{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}:
stdenv.mkDerivation rec {
version = "2.0.0-beta3";
name = "qca-ossl-${version}";
src = fetchurl {
url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2";
sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08";
};
# SVN version has stabilized and has a lot of fixes for fresh OpenSSL
# Take the main source from there
git_src = fetchgit {
url = git://anongit.kde.org/qca;
rev = "0a8b9db6613f2282fe492ff454412f502a6be410";
sha256 = "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1";
};
buildInputs = [ qt4 qca2 openssl ];
nativeBuildInputs = [ which ];
dontAddPrefix = true;
configureFlags="--no-separate-debug-info --with-qca=${qca2}
--with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
preConfigure=''
cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp .
configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
'';
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture OpenSSL plugin";
license = "LGPL";
homepage = http://delta.affinix.com/qca;
maintainers = [ maintainers.urkud ];
};
}

2
pkgs/development/libraries/qt-3/default.nix
View File

@@ -47,7 +47,7 @@ stdenv.mkDerivation {
-I${randrproto}/include" else "-no-xrandr"}
${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"}
${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
${if xftSupport then "-xft
-L${libXft}/lib -I${libXft}/include
-L${libXft.freetype}/lib -I${libXft.freetype}/include

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
# The following libraries are only used in plugins
buildInputs =
[ cups # Qt dlopen's libcups instead of linking to it
mysql postgresql sqlite libjpeg libmng libtiff icu ]
mysql.lib postgresql sqlite libjpeg libmng libtiff icu ]
++ optionals gtkStyle [ gtk gdk_pixbuf ];
nativeBuildInputs = [ perl pkgconfig which ];

2
pkgs/development/libraries/qt-5/5.3/default.nix
View File

@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
# doesn't remain a runtime-dep if not used
++ optionals mesaSupported [ mesa mesa_glu ]
++ optional (cups != null) cups
++ optional (mysql != null) mysql
++ optional (mysql != null) mysql.lib
++ optional (postgresql != null) postgresql;
buildInputs = [ gdb bison flex gperf ruby ];

2
pkgs/development/libraries/qt-5/5.4/qtbase.nix
View File

@@ -148,7 +148,7 @@ stdenv.mkDerivation {
# doesn't remain a runtime-dep if not used
++ optionals mesaSupported [ mesa mesa_glu ]
++ optional (cups != null) cups
++ optional (mysql != null) mysql
++ optional (mysql != null) mysql.lib
++ optional (postgresql != null) postgresql;
buildInputs = [ gdb bison flex gperf ruby ];

18
pkgs/development/libraries/sfsexp/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "sfsexp-${version}";
version = "1.3";
src = fetchurl {
url = "mirror://sourceforge/sexpr/sexpr-${version}.tar.gz";
sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k";
};
meta = with stdenv.lib; {
description = "Small, fast s-expression library";
homepage = "http://sexpr.sourceforge.net/";
maintainers = with maintainers; [ jb55 ];
license = licenses.gpl3;
};
}

4
pkgs/development/libraries/skalibs/default.nix
View File

@@ -2,7 +2,7 @@
let
version = "2.2.0.0";
version = "2.3.2.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/skalibs";
rev = "refs/tags/v${version}";
sha256 = "1ww45ygrws7h3p3p7y3blc5kzvvy5fmzb158ngfbdamf0pgc5vkn";
sha256 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a";
};
dontDisableStatic = true;

4
pkgs/development/libraries/talloc/default.nix
View File

@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
"--builtin-libraries=replace"
];
postInstall = ''
ar qf $out/lib/libtalloc.a bin/default/talloc_5.o
'';
meta = with stdenv.lib; {
description = "Hierarchical pool based memory allocator with destructors";
homepage = http://tdb.samba.org/;

1
pkgs/development/libraries/ti-rpc/default.nix
View File

@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
homepage = "http://sourceforge.net/projects/libtirpc/";
description = "The transport-independent Sun RPC implementation (TI-RPC)";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
longDescription = ''
Currently, NFS commands use the SunRPC routines provided by the

4
pkgs/development/libraries/unixODBCDrivers/default.nix
View File

@@ -64,8 +64,8 @@ args : with args;
md5 = "a484f590464fb823a8f821b2f1fd7fef";
};
configureFlags = "--disable-gui"
+ " --with-mysql-path=${mysql} --with-unixODBC=${unixODBC}";
buildInputs = [libtool zlib];
+ " --with-mysql-path=${mysql.lib} --with-unixODBC=${unixODBC}";
buildInputs = [ libtool zlib ];
inherit mysql unixODBC;
};
ini =