diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-04 13:17:59 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-04 13:17:59 +0200 |
commit | 5d4c6f7bdae4ad01411d535d8c852cdf1d065af7 (patch) | |
tree | 06664ab92f0897eaaafa94944b99ed1ea2608c5e /pkgs/development | |
parent | a44ac81f46ff99931281869879b7904851c1f5de (diff) | |
parent | 0851f48a022883299b9b246c9df31ee02a3c30cb (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development')
8 files changed, 49 insertions, 18 deletions
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index eaeddbcad3682..40a96553fbe2b 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool -, audit, glib, libusb, libxml2 +, audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null , gst-plugins-base ? null @@ -53,7 +53,7 @@ in buildInputs = [ glib libxml2 ] - ++ stdenv.lib.optional enableUsb libusb + ++ stdenv.lib.optional enableUsb libusb1 ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 17b2a6b7c9908..64c0171854265 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; }; - buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ] + buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 3d13553cfd2ee..f754756f768bd 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that we will delete before installation. mkdir -p $out/lib - ln -s $PWD/tests/scanner/libregress-1.0.so $out/lib/libregress-1.0.so + ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} cleanLibregressSymlink() { - rm $out/lib/libregress-1.0.so + rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} } preInstallPhases="$preInstallPhases cleanLibregressSymlink" ''; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index da04f0b05edd4..ae5fd7531325f 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , meson , ninja , gettext @@ -96,6 +97,12 @@ in stdenv.mkDerivation rec { }; patches = [ + # Fix build with neon 0.31 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch"; + sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; + }) ./fix_pkgconfig_includedir.patch ]; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 5816f044f574a..6fe4484e6a312 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova -, curl, libjpeg, gsl }: +{ stdenv +, fetchurl +, cmake +, cfitsio +, libusb1 +, zlib +, boost +, libnova +, curl +, libjpeg +, gsl +}: stdenv.mkDerivation { name = "indilib-1.1.0"; @@ -9,13 +19,27 @@ stdenv.mkDerivation { sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; }; - patches = [ ./udev-dir.patch ] ; + patches = [ + ./udev-dir.patch + ]; - buildInputs = [ curl cmake cfitsio libusb zlib boost - libnova libjpeg gsl ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + curl + cfitsio + libusb1 + zlib + boost + libnova + libjpeg + gsl + ]; meta = { - homepage = https://www.indilib.org/; + homepage = "https://www.indilib.org/"; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementaion of the INDI protocol for POSIX operating systems"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 9a6db72ae0583..cecb2b6750be6 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -5,7 +5,7 @@ , pkgconfig , meson , ninja -, libusb +, libusb1 , pixman , glib , nss @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libusb + libusb1 # drop in 2.0 for gusb pixman glib nss diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index bf48e88a4ec78..c6bb790646976 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig -, libusb +, libusb1 , readline }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libusb + libusb1 readline ]; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index b3026cdf84d45..b9fc3e2d514cd 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb zlib ]; + buildInputs = [ libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; |