diff options
Diffstat (limited to 'pkgs/development/libraries')
10 files changed, 145 insertions, 49 deletions
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 0f0e30ef0f3..76e49768d53 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; - # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details. + # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details. doCheck = false; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch new file mode 100644 index 00000000000..629ea102971 --- /dev/null +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -0,0 +1,55 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -7,7 +7,7 @@ + conf.set('demo_agent', '') + endif + +- conf_dir = join_paths(get_option('sysconfdir'), 'geoclue') ++ conf_dir = join_paths(sysconfdir_install, 'geoclue') + configure_file(output: 'geoclue.conf', + input: 'geoclue.conf.in', + configuration: conf, +@@ -26,7 +26,7 @@ + # DBus Service policy file + dbus_service_dir = get_option('dbus-sys-dir') + if dbus_service_dir == '' +- dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d') ++ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d') + endif + configure_file(output: 'org.freedesktop.GeoClue2.conf', + input: 'org.freedesktop.GeoClue2.conf.in', +--- a/demo/meson.build ++++ b/demo/meson.build +@@ -56,8 +56,7 @@ + install_dir: desktop_dir) + + # Also install in the autostart directory. +- autostart_dir = join_paths(get_option('prefix'), +- get_option('sysconfdir'), ++ autostart_dir = join_paths(sysconfdir_install, + 'xdg', 'autostart') + meson.add_install_script('install-file.py', + desktop_file.full_path(), +--- a/meson.build ++++ b/meson.build +@@ -22,6 +22,11 @@ + datadir = join_paths(get_option('prefix'), get_option('datadir')) + conf.set_quoted('LOCALEDIR', datadir + '/locale') + conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) ++if get_option('sysconfdir_install') != '' ++ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install')) ++else ++ sysconfdir_install = get_option('sysconfdir') ++endif + + configure_file(output: 'config.h', configuration : conf) + configinc = include_directories('.') +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -34,3 +34,6 @@ + option('dbus-srv-user', + type: 'string', value: 'root', + description: 'The user (existing) as which the service will run') ++option('sysconfdir_install', ++ type: 'string', value: '', ++ description: 'sysconfdir to use during installation') diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index f2eeb9ae40b..5e83ba71c1b 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs"; }; + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ @@ -36,6 +40,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" + "--sysconfdir=/etc" + "-Dsysconfdir_install=${placeholder "out"}/etc" ] ++ optionals stdenv.isDarwin [ "-D3g-source=false" "-Dcdma-source=false" diff --git a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch b/pkgs/development/libraries/gnome-sharp/Makefile.in.patch deleted file mode 100644 index 46b644f2471..00000000000 --- a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sample/gnomevfs/Makefile.in 2009-03-03 16:09:52.000000000 +0000 -+++ b/sample/gnomevfs/Makefile.in 2014-10-14 13:35:51.020427244 +0100 -@@ -218,7 +218,7 @@ - - @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS = - @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS = --@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe -+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = - assemblies = ../../gnomevfs/gnome-vfs-sharp.dll - references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies)) - noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS) diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index d80144b3d71..db93bdf27af 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,17 +1,35 @@ -{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}: +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, gtk2 +, mono +, gtk-sharp-2_0 +, gnome2 +, autoconf +, automake +, libtool +, which +}: -stdenv.mkDerivation { - name = "gnome-sharp-2.24.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz; - sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; +stdenv.mkDerivation rec { + name = "gnome-sharp-${version}"; + version = "2.24.4"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gnome-sharp"; + rev = "${version}"; + sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; buildInputs = [ gtk2 mono gtk-sharp-2_0 ] - ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); + ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); - patches = [ ./Makefile.in.patch ]; + preConfigure = '' + ./bootstrap-${lib.versions.majorMinor version} + ''; dontStrip = true; diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index cf4069871d1..06fffc4f524 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -3,6 +3,8 @@ stdenv.mkDerivation rec { name = "gtest-${version}"; version = "1.8.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "google"; repo = "googletest"; @@ -12,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; homepage = https://github.com/google/googletest; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index c037db97c04..659dc14800e 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mono +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, mono , glib , pango , gtk2 @@ -12,32 +16,44 @@ , libgnomeprintui ? null , libxml2 , monoDLLFixer +, autoconf +, automake +, libtool +, which }: -stdenv.mkDerivation { - name = "gtk-sharp-2.12.10"; +stdenv.mkDerivation rec { + name = "gtk-sharp-${version}"; + version = "2.12.45"; builder = ./builder.sh; - src = fetchurl { - url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz; - sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc"; + src = fetchFromGitHub { + owner = "mono"; + repo = "gtk-sharp"; + rev = version; + sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg"; }; - # patches = [ ./dllmap-glue.patch ]; - - # patch bad usage of glib, which wasn't tolerated anymore - prePatch = '' - for f in glib/glue/{thread,list,slist}.c; do - sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f" + postInstall = '' + pushd $out/bin + for f in gapi2-* + do + substituteInPlace $f --replace mono ${mono}/bin/mono done + popd ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + buildInputs = [ mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; + preConfigure = '' + ./bootstrap-${lib.versions.majorMinor version} + ''; + dontStrip = true; inherit monoDLLFixer; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 7e80ec817d1..1d07fe6ca26 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -6,7 +6,7 @@ let pname = "libhandy"; - version = "0.0.5"; + version = "0.0.6"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08"; + sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 2f20150ad16..db9c2946935 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"; + sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 52bc0ac5cfd..5aa26a749e4 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "libuchardet-${version}"; + pname = "uchardet"; + version = "0.0.6"; - version = "0.0.5"; + outputs = [ "bin" "out" "man" "dev" ]; - src = fetchFromGitHub { - owner = "BYVoid"; - repo = "uchardet"; - rev = "v${version}"; - sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm"; + src = fetchurl { + url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; + sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"; }; buildInputs = [ cmake ]; - doCheck = false; # fails all the tests (ctest) + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + # TODO: move the following to CMake setup hook + "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" + "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man" + ]; + + doCheck = true; meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; - homepage = https://www.byvoid.com/zht/project/uchardet; - license = licenses.mpl11; + homepage = https://www.freedesktop.org/wiki/Software/uchardet/; + license = licenses.mpl11; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; }; |