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

Merge remote-tracking branch 'upstream/staging' into deps-reorg

Browse Source
This commit is contained in:
John Ericson
2017-09-28 12:32:57 -04:00
parent f08d6f0e2d 4e22e88b91
commit f037625f87
789 changed files with 15725 additions and 8096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,14 +2,14 @@
, intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec {
versionMajor = "2.24";
versionMinor = "1";
versionMajor = "2.26";
versionMinor = "0";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d";
sha256 = "d25e528e1406a10c7d9b675aa15e638bcbf0a122ca3681f655a30cce83272fb9";
};
nativeBuildInputs = [ pkgconfig ];

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

@@ -2,14 +2,14 @@
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation rec {
versionMajor = "2.24";
versionMinor = "1";
versionMajor = "2.26";
versionMinor = "0";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b";
sha256 = "511568a65fda11fdd5ba5d4adfd48d5d76810d0e6ba4f7460f1b2ec0dbbbc337";
};
outputs = [ "out" "dev" ];

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

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
let
ver_maj = "2.22";
ver_maj = "2.26";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
sha256 = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6";
sha256 = "eafe49d5c4546cb723ec98053290d7e0b8d85b3fdb123938213acb7bb4178827";
};
enableParallelBuilding = true;

27
pkgs/development/libraries/cwiid/default.nix
View File

@@ -1,12 +1,14 @@
{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk2 }:
{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }:
stdenv.mkDerivation rec {
name = "cwiid-2010-02-21-git";
name = "cwiid-${version}-git";
version = "2010-02-21";
src = fetchgit {
url = https://github.com/abstrakraft/cwiid;
sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h";
rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
src = fetchFromGitHub {
owner = "abstrakraft";
repo = "cwiid";
rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h";
};
hardeningDisable = [ "format" ];
@@ -17,19 +19,20 @@ stdenv.mkDerivation rec {
sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in
'';
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ bison flex bluez gtk2 ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
postInstall = ''
# Some programs (for example, cabal-install) have problems with the double 0
sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc
'';
meta = {
meta = with stdenv.lib; {
description = "Linux Nintendo Wiimote interface";
homepage = http://cwiid.org;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.bennofs ];
platforms = stdenv.lib.platforms.linux;
homepage = http://cwiid.org;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ bennofs ];
platforms = platforms.linux;
};
}

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

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/dirac;
description = "A general-purpose video codec based on wavelets";
platforms = platforms.all;
platforms = platforms.linux;
license = with licenses; [ mpl11 gpl2 lgpl21 ];
maintainer = maintainers.igsha;
};

11
pkgs/development/libraries/gdbm/default.nix
View File

@@ -25,6 +25,17 @@ stdenv.mkDerivation rec {
'';
configureFlags = [ "--enable-libgdbm-compat" ];
postInstall = ''
# create symlinks for compatibility
install -dm755 $out/include/gdbm
(
cd $out/include/gdbm
ln -s ../gdbm.h gdbm.h
ln -s ../ndbm.h ndbm.h
ln -s ../dbm.h dbm.h
)
'';
meta = with lib; {
description = "GNU dbm key/value database library";

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

@@ -12,8 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" "info" ];
# FIXME stackprotector needs gcc 4.9 in bootstrap tools
hardeningDisable = [ "format" "stackprotector" ];
hardeningDisable = [ "format" ];
LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";

4
pkgs/development/libraries/glfw/2.x.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, mesa, libX11 }:
{ stdenv, fetchurl, mesa_glu, mesa_noglu, libX11, libXext }:
stdenv.mkDerivation rec {
name = "glfw-2.7.9";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i";
};
buildInputs = [ mesa libX11 ];
buildInputs = [ mesa_glu mesa_noglu libX11 libXext ];
buildPhase = ''
make x11

16
pkgs/development/libraries/glfw/3.x.nix
View File

@@ -1,5 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper
, libXinerama, libXcursor
{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11
, darwin, fixDarwinDylibNames
}:
@@ -16,12 +15,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [
cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper
libXinerama libXcursor
] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]);
propagatedBuildInputs = [ mesa_noglu ];
cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
nativeBuildInputs = [ cmake ];
buildInputs = [
libX11 libXrandr libXinerama libXcursor
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]);
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with stdenv.lib; {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";

84
pkgs/development/libraries/glib/default.nix
View File

@@ -42,8 +42,8 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.52";
ver_min = "3";
ver_maj = "2.54";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -51,10 +51,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5";
sha256 = "fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
patches = optional stdenv.isDarwin ./darwin-compilation.patch
++ optional doCheck ./skip-timer-test.patch;
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
@@ -76,21 +77,23 @@ stdenv.mkDerivation rec {
++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
++ optional stdenv.isSunOS "--disable-dtrace";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
+ optionalString stdenv.isSunOS " -DBSD_COMP";
NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl"
++ optional stdenv.isSunOS "-DBSD_COMP";
preConfigure = if !stdenv.isSunOS then null else
''
sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
'';
preConfigure = optionalString stdenv.isSunOS ''
sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
'';
postConfigure = ''
patchShebangs ./gobject/
'';
LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}";
LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf";
preBuild = optionalString stdenv.isDarwin
''
export MACOSX_DEPLOYMENT_TARGET=
'';
preBuild = optionalString stdenv.isDarwin ''
export MACOSX_DEPLOYMENT_TARGET=
'';
enableParallelBuilding = true;
DETERMINISTIC_BUILD = 1;
@@ -100,33 +103,36 @@ stdenv.mkDerivation rec {
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
''
# This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
+ ''
sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
'';
# This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
+ ''
sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
'';
inherit doCheck;
preCheck = optionalString doCheck
'' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo"
export XDG_CACHE_HOME="$TMP"
export XDG_RUNTIME_HOME="$TMP"
export HOME="$TMP"
export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
preCheck = optionalString doCheck ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo"
export XDG_CACHE_HOME="$TMP"
export XDG_RUNTIME_HOME="$TMP"
export HOME="$TMP"
export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
export PATH="$PATH:$(pwd)/gobject"
echo "PATH=$PATH"
substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true"
# Needs machine-id, comment the test
sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c
# All gschemas fail to pass the test, upstream bug?
sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
# Cannot reproduce the failing test_associations on hydra
sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
# Needed because of libtool wrappers
sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
'';
substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop \
--replace "Exec=/bin/true" "Exec=${coreutils}/bin/true"
# Needs machine-id, comment the test
sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c
# All gschemas fail to pass the test, upstream bug?
sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
# Cannot reproduce the failing test_associations on hydra
sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
# Needed because of libtool wrappers
sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
'';
passthru = {
gioModuleDir = "lib/gio/modules";
@@ -136,7 +142,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C library of programming buildings blocks";
homepage = https://www.gtk.org/;
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ lovek323 raskin ];
platforms = platforms.unix;

5
pkgs/development/libraries/gmime/3.nix
View File

@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
propagatedBuildInputs = [ glib zlib gpgme libidn ];
buildInputs = [ gobjectIntrospection zlib gpgme libidn ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib ];
configureFlags = [ "--enable-introspection=yes" ];
enableParallelBuilding = true;

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

@@ -5,7 +5,7 @@
}:
let
version = "1.4.8";
version = "1.5.1";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131";
sha256 = "56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51";
};
outputs = [ "out" "dev" ];

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

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
homepage = https://www.nic.ad.jp/ja/idn/idnkit;
description = "Provides functionalities about i18n domain name processing";
license = "idnkit-2 license";
platforms = platforms.unix;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];
};
}

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

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
configureFlags = optional stdenv.isDarwin "--enable-amd64=no"
++ optional (!x11Support) "--without-x";
outputs = [ "out" "bin" "dev" ];
outputs = [ "bin" "out" "dev" ];
postInstall = ''
moveToOutput bin/imlib2-config "$dev"

3
pkgs/development/libraries/java/rhino/default.nix
View File

@@ -2,7 +2,6 @@
let
version = "1.7R2";
options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here.
xbeans = fetchurl {
url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
@@ -33,7 +32,7 @@ stdenv.mkDerivation {
buildInputs = [ unzip ant javac jvm ];
buildPhase = "ant ${options} jar";
buildPhase = "ant jar";
doCheck = false;
# FIXME: Install javadoc as well.

3
pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
View File

@@ -14,9 +14,6 @@ mkDerivation {
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
preConfigure = ''
outputBin=dev
'';
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libfilezilla-${version}";
version = "0.10.0";
version = "0.10.1";
src = fetchurl {
url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
sha256 = "10ik96s4r8kbgc5z4z5mqk8w1p3plakqavf6j86a48gl8in1f45x";
sha256 = "1yi9db0hpxh3giyjhkbz7ajmf95qw27xdvh3xvw208zri5k575x0";
};
meta = with stdenv.lib; {

25
pkgs/development/libraries/libnfs/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
name = "libnfs-${version}";
version = "2.0.0";
src = fetchFromGitHub {
owner = "sahlberg";
repo = "libnfs";
rev = "libnfs-${version}";
sha256 = "1xd1xb09jxwmx7hblv0f9gxv7i1glk3nbj2vyq50zpi158lnf2mb";
};
nativeBuildInputs = [ autoreconfHook ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "NFS client library";
homepage = https://github.com/sahlberg/libnfs;
license = with licenses; [ lgpl2 bsd2 gpl3 ];
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
};
}

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses ? null, perl ? null }:
stdenv.mkDerivation rec {
name = "liboping-1.9.0";
name = "liboping-1.10.0";
src = fetchurl {
url = "http://verplant.org/liboping/files/${name}.tar.bz2";
sha256 = "0c1mdx9ixqypayhm617jjv9kr6y60nh3mnryafjzv23bnn41vfs4";
sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
};
buildInputs = [ ncurses perl ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://noping.cc/;
license = licenses.lgpl21;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}

20
pkgs/development/libraries/libproxy/default.nix
View File

@@ -1,28 +1,30 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
, dbus, networkmanager, webkitgtk216x, pcre, python2 }:
, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }:
stdenv.mkDerivation rec {
name = "libproxy-${version}";
version = "0.4.13";
version = "0.4.15";
src = fetchFromGitHub {
owner = "libproxy";
repo = "libproxy";
rev = version;
sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92";
sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ dbus networkmanager webkitgtk216x pcre ];
buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ];
cmakeFlags = [
"-DWITH_WEBKIT3=ON"
"-DWITH_MOZJS=OFF"
"-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}"
];
preConfigure = ''
cmakeFlagsArray+=(
"-DWITH_MOZJS=ON"
"-DPYTHON2_SITEPKG_DIR=$out/${python2.sitePackages}"
"-DPYTHON3_SITEPKG_DIR=$out/${python3.sitePackages}"
)
'';
meta = with stdenv.lib; {
platforms = platforms.linux;

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

@@ -33,7 +33,7 @@ in {
};
libressl_2_6 = generic {
version = "2.6.0";
sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4";
version = "2.6.2";
sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh";
};
}

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

@@ -4,15 +4,15 @@
, libintlOrEmpty
, intltool, python }:
let
majorVersion = "2.59";
version = "${majorVersion}.90.1";
majorVersion = "2.60";
version = "${majorVersion}.0";
in
stdenv.mkDerivation {
name = "libsoup-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
sha256 = "0bh8wa0szkm9bx2anfq655zshwf6jhxvrqwx8jyh8rqgi6z9dhz0";
sha256 = "b324edbecda0884143c0853b4a2bd5bd37fb3761f12f293c621ff34b9acdc84c";
};
prePatch = ''
@@ -38,8 +38,6 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
inherit (glib.meta) maintainers platforms;
};

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

@@ -2,14 +2,14 @@
, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
version = "1.13.1";
version = "1.14.1";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
sha256 = "0k348kgdphha1w4cw78zngq3gqcrhcn0az7k0k4w2bgmdf4ip8z8";
sha256 = "1121qvnvpcabq1bl2k41jq8r2hn2x123csiaf7s9vrq66bbxgfdx";
};
postPatch = let

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

@@ -4,7 +4,7 @@
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, xen, zfs, parted
, curl, libiconv, gmp, xen, zfs, parted, qemu
}:
with stdenv.lib;
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
wrapProgram $out/sbin/libvirtd \
--prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}
--prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl qemu ]}
'';
enableParallelBuilding = true;

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

@@ -10,22 +10,13 @@ let
in stdenv.mkDerivation rec {
name = "libxml2-${version}";
version = "2.9.4";
version = "2.9.5";
src = fetchurl {
url = "http://xmlsoft.org/sources/${name}.tar.gz";
sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz";
sha256 = "0f6d5nkvcfx8yqis2dwrnv6qaj0nhiifz49y657vmrwwxvnc2ca0";
};
patches = [
(fetchpatch {
# Contains fixes for CVE-2016-{4658,5131} and other bugs.
name = "misc.patch";
url = "https://git.gnome.org/browse/libxml2/patch/?id=e905f081&id2=v2.9.4";
sha256 = "14rnzilspmh92bcpwbd6kqikj36gx78al42ilgpqgl1609krb5m5";
})
];
outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py";
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";

12
pkgs/development/libraries/lmdb/default.nix
View File

@@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub }:
let optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "lmdb-${version}";
version = "0.9.21";
@@ -16,7 +15,8 @@ in stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" ];
makeFlags = [ "prefix=$(out)" "CC=cc" ];
makeFlags = [ "prefix=$(out)" "CC=cc" ]
++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
doCheck = true;
checkPhase = "make test";
@@ -25,12 +25,6 @@ in stdenv.mkDerivation rec {
moveToOutput bin "$bin"
moveToOutput "lib/*.a" REMOVE # until someone needs it
''
# fix bogus library name
+ stdenv.lib.optionalString stdenv.isDarwin ''
mv "$out"/lib/liblmdb.{so,dylib}
''
# add lmdb.pc (dynamic only)
+ ''
mkdir -p "$dev/lib/pkgconfig"

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

@@ -67,7 +67,7 @@ let
in
let
version = "17.1.9";
version = "17.1.10";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
sha256 = "5f51ad94341696097d5df7b838183534478216858ac0fc8de183671a36ffea1a";
sha256 = "cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb";
};
prePatch = "patchShebangs .";

47
pkgs/development/libraries/opencascade/6.5.nix
View File

@@ -1,47 +0,0 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4,
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-6.5.5";
src = fetchurl {
url = http://files.opencascade.com/OCCT/OCC_6.5.5_release/OpenCASCADE655.tgz;
sha256 = "1dnik00adfh6dxvn9kgf35yjda8chbi05f71i9119idmmrcapipm";
};
buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
preUnpack = ''
sourceRoot=`pwd`/ros
'';
preConfigure = ''
sh ./build_configure
'';
# -fpermissive helps building opencascade, although gcc detects a flaw in the code
# and reports an error otherwise. Further versions may fix that.
NIX_CFLAGS_COMPILE = "-fpermissive"
# https://bugzilla.redhat.com/show_bug.cgi?id=902561
+ " -DUSE_INTERP_RESULT"
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
+ " -DGLX_GLXEXT_LEGACY";
hardeningDisable = [ "format" ];
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype.dev}" ];
postInstall = ''
mv $out/inc $out/include
mkdir -p $out/share/doc/${name}
cp -R ../doc $out/share/doc/${name}
'';
enableParallelBuilding = true;
meta = {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

35
pkgs/development/libraries/opencascade/default.nix
View File

@@ -1,39 +1,22 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}:
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4,
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-6.6.0";
name = "opencascade-oce-0.17.2";
src = fetchurl {
url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz;
sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3";
url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz;
sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd";
};
buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ];
buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
sourceRoot = "ros/adm/cmake";
cmakeFlags = [
"-D3RDPARTY_TCL_DIR=${tcl}"
"-D3RDPARTY_FREETYPE_DIR=${freetype.dev}"
# Not used on Linux but must be defined during configuration.
"-D3RDPARTY_FREETYPE_DLL=${freetype.dev}"
];
preConfigure = ''
cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
'';
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
hardeningDisable = [ "format" ];
preConfigure = ''
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out"
'';
postInstall = ''
mv $out/inc $out/include
mkdir -p $out/share/doc/${name}
cp -R ../../../doc $out/share/doc/${name}
'';
enableParallelBuilding = true;
meta = {

28
pkgs/development/libraries/opencascade/oce.nix
View File

@@ -1,28 +0,0 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4,
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-oce-0.17.2";
src = fetchurl {
url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz;
sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd";
};
buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
preConfigure = ''
cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
'';
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
enableParallelBuilding = true;
meta = {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

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

@@ -28,12 +28,13 @@ stdenv.mkDerivation rec {
"--disable-dependency-tracking" # speeds up one-time build
"--enable-modules"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-crypt"
] ++ stdenv.lib.optional (openssl == null) "--without-tls"
++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
installFlags = [ "sysconfdir=$(out)/etc" ];
installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ];
# 1. Fixup broken libtool
# 2. Libraries left in the build location confuse `patchelf --shrink-rpath`

7
pkgs/development/libraries/p11-kit/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv
, libffi, libtasn1, gtk_doc, libxslt, docbook_xsl }:
, libffi, libtasn1 }:
stdenv.mkDerivation rec {
name = "p11-kit-${version}";
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy";
};
outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "dev"];
outputBin = "dev";
nativeBuildInputs = [ autoreconfHook which pkgconfig gtk_doc libxslt docbook_xsl ];
nativeBuildInputs = [ autoreconfHook which pkgconfig ];
buildInputs = [ libffi libtasn1 libiconv ];
autoreconfPhase = ''
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--localstatedir=/var"
"--without-trust-paths"
"--enable-doc"
];
installFlags = [ "exampledir=\${out}/etc/pkcs11" ];

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

@@ -6,25 +6,16 @@ with stdenv.lib;
let
ver_maj = "1.40";
ver_min = "11";
ver_min = "12";
in
stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e";
sha256 = "75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994d1ade97c5603e2d1f3161cfc";
};
patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=785978#c9
(fetchpatch rec {
name = "pango-fix-gtk2-test-failures.patch";
url = "https://bug785978.bugzilla-attachments.gnome.org/attachment.cgi?id=357690&action=diff&collapsed=&context=patch&format=raw&headers=1";
sha256 = "055m2dllfr5pgw6bci72snw38f4hsyw1x7flj188c965ild8lq3a";
})
];
outputs = [ "bin" "dev" "out" "devdoc" ];
buildInputs = [ gobjectIntrospection ];

36
pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch Normal file
View File

@@ -0,0 +1,36 @@
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 341d3bc..3368234 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
QMacAutoReleasePool pool;
userProfiles.clear();
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
for (NSString *ifName in wifiInterfaces) {
CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
QMacAutoReleasePool pool;
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
for (NSString *ifName in wifiInterfaces) {
scanThread->interfaceName = QString::fromNSString(ifName);
scanThread->start();
QString TableGenerator::findComposeFile()
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 59b7637..b91139d 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -320,7 +320,7 @@ static void qt_closePopups()
+ (void)applicationActivationChanged:(NSNotification*)notification
{
const id sender = self;
- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
+ NSEnumerator *windowEnumerator = nullptr;
NSApplication *application = [NSApplication sharedApplication];
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)

7
pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
View File

@@ -62,7 +62,7 @@ stdenv.mkDerivation {
AGL AppKit ApplicationServices Carbon Cocoa
CoreAudio CoreBluetooth CoreLocation CoreServices
DiskArbitration Foundation OpenGL
darwin.cf-private darwin.libobjc libiconv
darwin.libobjc libiconv
]);
buildInputs = [ ]
@@ -79,7 +79,8 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" "bin" ];
patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series);
copyPathsToStore (lib.readPathsFromFile ./. ./series)
++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch;
postPatch =
''
@@ -110,7 +111,7 @@ stdenv.mkDerivation {
-e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
./configure
sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
sed -i '27,$d' ./mkspecs/features/mac/default_post.prf
sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf
'';

15
pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
View File

@@ -116,14 +116,18 @@ fi
if [ -z "$NIX_QT5_TMP" ]; then
if [ -z "$NIX_QT_SUBMODULE" ]; then
NIX_QT5_TMP=$(pwd)/__nix_qt5__
if [ -z "$IN_NIX_SHELL" ]; then
NIX_QT5_TMP=$(pwd)/__nix_qt5__
else
NIX_QT5_TMP=$(mktemp -d)
fi
else
NIX_QT5_TMP=$out
fi
mkdir -p "$NIX_QT5_TMP/nix-support"
for subdir in bin include lib mkspecs share; do
mkdir "$NIX_QT5_TMP/$subdir"
mkdir -p "$NIX_QT5_TMP/$subdir"
echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
done
@@ -142,3 +146,10 @@ EOF
export QMAKE="$NIX_QT5_TMP/bin/qmake"
fi
_qtShellCleanupHook () {
rm -fr $NIX_QT5_TMP
}
if [ -n "$IN_NIX_SHELL" ]; then
trap _qtShellCleanupHook EXIT
fi

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

@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;";
license = licenses.bsd3;
maintainers = with maintainers; [ wkennington ];
platforms = platforms.all;
platforms = platforms.linux;
};
}

25
pkgs/development/libraries/science/biology/nifticlib/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl, cmake, zlib }:
stdenv.mkDerivation rec {
pname = "nifticlib";
pversion = "2.0.0";
name = "${pname}-${pversion}";
src = fetchurl {
url = "mirror://sourceforge/project/niftilib/${pname}/${pname}_2_0_0/${name}.tar.gz";
sha256 = "123z9bwzgin5y8gi5ni8j217k7n683whjsvg0lrpii9flgk8isd3";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ];
checkPhase = "ctest";
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/niftilib;
description = "Medical imaging format C API";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.linux;
license = licenses.publicDomain;
};
}

10
pkgs/development/libraries/science/math/blas/default.nix
View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, gfortran }:
let
version = "3.5.0";
in
stdenv.mkDerivation rec {
name = "blas-${version}";
version = "3.7.1";
src = fetchurl {
url = "http://www.netlib.org/blas/${name}.tgz";
sha256 = "096a3apnh899abjymjjg8m34hncagkzp9qxw08cms98g71fpfzgg";
sha256 = "1hvmwp488hd6sdxdbmhjhmyrrd4s1ds1cjzh5d86l10b3wsm99n5";
};
buildInputs = [gfortran];
buildInputs = [ gfortran ];
configurePhase = ''
echo >make.inc "SHELL = ${stdenv.shell}"

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

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
zimg, libass, yasm, python3,
zimg, libass, yasm, python3, libiconv, ApplicationServices,
ocrSupport ? false, tesseract,
imwriSupport? true, imagemagick7
}:
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
autoreconfHook
zimg libass tesseract yasm
(python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ optional ocrSupport tesseract
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
++ optional ocrSupport tesseract
++ optional imwriSupport imagemagick7;
configureFlags = [

22
pkgs/development/libraries/vmmlib/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas
, Accelerate, CoreGraphics, CoreVideo
}:
stdenv.mkDerivation rec {
version = "1.6.2";
name = "vmmlib-${version}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ stdenv cmake boost blas ];
src = fetchFromGitHub {
owner = "VMML";
@@ -13,13 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
};
patches = [
./disable-cpack.patch #disable the need of cpack/rpm
];
patches = [
./disable-cpack.patch #disable the need of cpack/rpm
];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ boost blas ]
++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
enableParallelBuilding = true;
doCheck = true;
doCheck = !stdenv.isDarwin;
checkTarget = "test";
@@ -37,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = http://github.com/VMML/vmmlib/;
maintainers = [ maintainers.adev ];
platforms = platforms.all;
};
};
}

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

@@ -11,10 +11,17 @@ stdenv.mkDerivation rec {
buildInputs = [ boost sqlite ];
meta = {
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.in \
--replace '-Wl,--as-needed' "" \
--replace '-Wl,-soname -Wl,libvsqlitepp.so.3' \
"-Wl,-install_name,$out/lib/libvsqlitepp.3.dylib"
'';
meta = with stdenv.lib; {
homepage = http://vsqlite.virtuosic-bytes.com/;
description = "C++ wrapper library for sqlite.";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
license = licenses.bsd3;
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/webkitgtk/2.16.nix
View File

@@ -101,4 +101,6 @@ stdenv.mkDerivation rec {
];
enableParallelBuilding = true;
outputs = [ "out" "dev" ];
}

2
pkgs/development/libraries/webkitgtk/2.17.nix
View File

@@ -103,4 +103,6 @@ stdenv.mkDerivation rec {
];
enableParallelBuilding = true;
outputs = [ "out" "dev" ];
}

38
pkgs/development/libraries/wlc/default.nix
View File

@@ -1,36 +1,38 @@
{ lib, stdenv, fetchgit, cmake, pkgconfig
, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm
, wayland-protocols
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa
, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols
, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm
, withOptionalPackages ? true, zlib, valgrind, doxygen
}:
stdenv.mkDerivation rec {
name = "wlc-${version}";
version = "0.0.9";
version = "0.0.9"; # 0.0.10 currently causes segfaults
src = fetchgit {
url = "https://github.com/Cloudef/wlc";
rev = "refs/tags/v${version}";
sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
src = fetchFromGitHub {
owner = "Cloudef";
repo = "wlc";
rev = "v${version}";
fetchSubmodules = true;
};
sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev
libX11 libXdamage systemd dbus_libs wayland-protocols
];
wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa
libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols
libpthreadstubs libXau libXdmcp libXext libXxf86vm ]
++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
doCheck = true;
checkTarget = "test";
meta = {
meta = with stdenv.lib; {
description = "A library for making a simple Wayland compositor";
homepage = https://github.com/Cloudef/wlc;
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
};
}

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

@@ -12,8 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper libxml2 gnutls libxslt libgcrypt libtool openssl nss ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ];
enableParallelBuilding = true;
doCheck = true;
@@ -24,6 +28,11 @@ stdenv.mkDerivation rec {
# otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
NIX_LDFLAGS = [ "-lgcrypt" ];
postInstall = ''
moveToOutput "bin/xmlsec1-config" "$dev"
moveToOutput "lib/xmlsec1Conf.sh" "$dev"
'';
postFixup = ''
wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib"
'';

19
pkgs/development/libraries/zeroc-ice/default.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 }:
{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5
, darwin, libiconv, Security
}:
stdenv.mkDerivation rec {
name = "zeroc-ice-${version}";
@@ -11,17 +13,20 @@ stdenv.mkDerivation rec {
sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
};
buildInputs = [ mcpp bzip2 expat openssl db5 ];
buildInputs = [ mcpp bzip2 expat openssl db5 ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
buildPhase = ''
cd cpp
make -j $NIX_BUILD_CORES OPTIMIZE=yes
postUnpack = ''
sourceRoot=$sourceRoot/cpp
'';
installPhase = ''
make -j $NIX_BUILD_CORES prefix=$out install
prePatch = ''
substituteInPlace config/Make.rules.Darwin \
--replace xcrun ""
'';
makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {