diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/expat/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/icu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libelf-freebsd/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/libossp-uuid/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 3 |
9 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 5b497aa76b8..90e60d59da0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,5 +1,5 @@ { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames -, toolset ? if stdenv.isDarwin || stdenv.isFreeBSD then "clang" else null +, toolset ? if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 78e2da3ffdb..766ef6c11c5 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2015-1283.patch ]; configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic"; - # NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC"; meta = with stdenv.lib; { homepage = http://www.libexpat.org/; diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a2196d26524..148e4f02a94 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; configureFlags = "--disable-debug" + - stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath"; + stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 3f8ed7c9de4..402087b2ded 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ] ++ optionals (!libOnly) [ "--with-openldap=${openldap}" ] ++ optionals (!stdenv.isFreeBSD) [ - "--with-berkeley-db=${db}" + "--with-berkeley-db=${db}" # XXX: this should of course work, but does not, as of nov 2015 (db==db58) "--with-capng" ]; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 3e09d4c6cd4..26fe2d90963 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation (rec { src = fetchsvn { url = svn://svn.code.sf.net/p/elftoolchain/code/trunk; rev = (stdenv.lib.strings.toInt version); + name = "elftoolchain-${version}"; }; buildInputs = [ gnum4 tet ]; diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index ddfc2a5132c..72fa1a29992 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; - configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic"; meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 7e9c11d700a..2c559d221ab 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.isFreeBSD; + doCheck = true; meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 25b547bf1cf..17e0485b29f 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { -datadir $out/share/${name} -translationdir $out/share/${name}/translations " - '' + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.cc.isClang '' sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf ''; @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { '' -v -no-separate-debug-info -release -no-fast -confirm-license -opensource - -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig + -${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite @@ -122,17 +122,18 @@ stdenv.mkDerivation rec { # The following libraries are only used in plugins buildInputs = [ cups # Qt dlopen's libcups instead of linking to it - mysql.lib postgresql sqlite libjpeg libmng libtiff icu ] + postgresql sqlite libjpeg libmng libtiff icu ] + ++ optionals (mysql != null) [ mysql.lib ] ++ optionals gtkStyle [ gtk gdk_pixbuf ]; nativeBuildInputs = [ perl pkgconfig which ]; enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin + NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; - NIX_LDFLAGS = optionalString stdenv.isDarwin + NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; preBuild = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 99be5162010..7a6f480215c 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation (rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC"; crossAttrs = { dontStrip = static; |