Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
installTargets = [ "install" "install-lib" "install-dev" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://savannah.nongnu.org/projects/acl";
|
||||
homepage = "https://savannah.nongnu.org/projects/acl";
|
||||
description = "Library and tools for manipulating access control lists";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://savannah.nongnu.org/projects/attr/";
|
||||
homepage = "https://savannah.nongnu.org/projects/attr/";
|
||||
description = "Library and tools for manipulating extended attributes";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
|
||||
homepage = http://www.gnu.org/software/ccrtp/;
|
||||
homepage = https://www.gnu.org/software/ccrtp/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "An implementation of the IETF real-time transport protocol (RTP)";
|
||||
homepage = http://www.gnu.org/software/ccrtp/;
|
||||
homepage = https://www.gnu.org/software/ccrtp/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
to build native threading applications for Microsoft Windows.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/commoncpp/;
|
||||
homepage = https://www.gnu.org/software/commoncpp/;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
|
||||
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://gcc.gnu.org/;
|
||||
homepage = https://gcc.gnu.org/;
|
||||
license = licenses.lgpl3Plus;
|
||||
description = "GNU Compiler Collection, version ${version} -- C++ standard library";
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
package also provides traditional dbm and ndbm interfaces.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/gdbm/;
|
||||
homepage = https://www.gnu.org/software/gdbm/;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
|
||||
, modemmanager, avahi, glib-networking, wrapGAppsHook, gobject-introspection
|
||||
{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
|
||||
, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobjectIntrospection, vala
|
||||
, withDemoAgent ? false
|
||||
}:
|
||||
|
||||
@@ -7,17 +7,20 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geoclue-${version}";
|
||||
version = "2.4.12";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "geoclue";
|
||||
repo = "geoclue";
|
||||
rev = version;
|
||||
sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig intltool wrapGAppsHook gobject-introspection
|
||||
pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobjectIntrospection
|
||||
# devdoc
|
||||
gtk-doc docbook_xsl docbook_xml_dtd_412
|
||||
];
|
||||
@@ -30,26 +33,20 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [ glib glib-networking ];
|
||||
|
||||
# Whitelist elementary's agent
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2b0491e408be1ebcdbe8751bb2637c1acb78f71e.patch";
|
||||
sha256 = "0pac94y55iksk340dlx3gkhb9lrci90mxqqy5fnh1zbjw9bqxfn4";
|
||||
})
|
||||
mesonFlags = [
|
||||
"-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
|
||||
"-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"-D3g-source=false"
|
||||
"-Dcdma-source=false"
|
||||
"-Dmodem-gps-source=false"
|
||||
"-Dnmea-source=false"
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--enable-introspection"
|
||||
"--enable-gtk-doc"
|
||||
"--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"--disable-silent-rules"
|
||||
"--disable-3g-source"
|
||||
"--disable-cdma-source"
|
||||
"--disable-modem-gps-source"
|
||||
"--disable-nmea-source"
|
||||
];
|
||||
postPatch = ''
|
||||
chmod +x demo/install-file.py
|
||||
patchShebangs demo/install-file.py
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Geolocation framework and some data providers";
|
||||
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
GNU packages produce multi-lingual messages.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/gettext/;
|
||||
homepage = https://www.gnu.org/software/gettext/;
|
||||
|
||||
maintainers = with maintainers; [ zimbatm vrthra ];
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@@ -187,7 +187,7 @@ stdenv.mkDerivation ({
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/libc/;
|
||||
homepage = https://www.gnu.org/software/libc/;
|
||||
description = "The GNU C Library";
|
||||
|
||||
longDescription =
|
||||
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
programming language and organized in the form of a library.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/glpk/;
|
||||
homepage = https://www.gnu.org/software/glpk/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ bjg timokau ];
|
||||
|
||||
@@ -5,11 +5,11 @@ let
|
||||
|
||||
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
|
||||
configGuess = fetchurl {
|
||||
url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
|
||||
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
|
||||
sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv";
|
||||
};
|
||||
configSub = fetchurl {
|
||||
url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
|
||||
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
|
||||
sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc";
|
||||
};
|
||||
in
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Attempt to guess a canonical system name";
|
||||
homepage = http://savannah.gnu.org/projects/config;
|
||||
homepage = https://savannah.gnu.org/projects/config;
|
||||
license = licenses.gpl3;
|
||||
# In addition to GPLv3:
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
|
||||
[ "--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>
|
||||
# <https://github.com/arpa2/gnutls-kdh/commit/330995a920037b6030ec0282b51dde3f8b493cad>
|
||||
# for the actual fix. Also an apparent race in the generation of
|
||||
# systemkey-args.h.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
|
||||
tampering, or message forgery."
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/gnutls/;
|
||||
homepage = https://www.gnu.org/software/gnutls/;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ eelco wkennington fpletz ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
(e.g. IMAP, SMTP, etc.) to authenticate peers.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/gsasl/;
|
||||
homepage = https://www.gnu.org/software/gsasl/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ shlevy ];
|
||||
|
||||
@@ -6,16 +6,15 @@
|
||||
let
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "gsignond";
|
||||
version = "unstable-2018-10-04";
|
||||
|
||||
version = "1.2.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "accounts-sso";
|
||||
repo = pname;
|
||||
rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
|
||||
sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
|
||||
rev = version;
|
||||
sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials.";
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
|
||||
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gsignond-plugin-mail-${version}";
|
||||
version = "2018-10-04";
|
||||
pname = "gsignond-plugin-mail";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "accounts-sso";
|
||||
repo = "gsignond-plugin-mail";
|
||||
rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346";
|
||||
sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw";
|
||||
rev = version;
|
||||
sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials.";
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
|
||||
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols.";
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
|
||||
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol.";
|
||||
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
|
||||
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
|
||||
@@ -20,4 +20,6 @@ symlinkJoin {
|
||||
substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
|
||||
--replace ${gsignond} $out
|
||||
'';
|
||||
|
||||
inherit (gsignond) meta;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
# ToDo: there might be more impurities than FMA support check
|
||||
./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
|
||||
./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
|
||||
];
|
||||
|
||||
# https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "The GNU Scientific Library, a large numerical library";
|
||||
homepage = http://www.gnu.org/software/gsl/;
|
||||
homepage = https://www.gnu.org/software/gsl/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
# ToDo: there might be more impurities than FMA support check
|
||||
./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
|
||||
./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
|
||||
(fetchpatch {
|
||||
name = "bug-39055.patch";
|
||||
url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
|
||||
url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
|
||||
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
|
||||
})
|
||||
];
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "The GNU Scientific Library, a large numerical library";
|
||||
homepage = http://www.gnu.org/software/gsl/;
|
||||
homepage = https://www.gnu.org/software/gsl/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gnu.org/software/gss/;
|
||||
homepage = https://www.gnu.org/software/gss/;
|
||||
description = "Generic Security Service";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ bjg wkennington ];
|
||||
|
||||
69
pkgs/development/libraries/hyperscan/default.nix
Normal file
69
pkgs/development/libraries/hyperscan/default.nix
Normal file
@@ -0,0 +1,69 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, ragel, python27
|
||||
, boost
|
||||
}:
|
||||
|
||||
# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
|
||||
# pcap used only in examples, pkgconfig used only to check for pcre
|
||||
# which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
|
||||
# I not see any reason (for now) to backport 8.41.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "hyperscan";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "hyperscan";
|
||||
sha256 = "017dxg0n3gn9i4j27rcvpnp4rkqgycqni6x5d15dqpidl7zg7059";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [ boost ];
|
||||
nativeBuildInputs = [ cmake ragel python27 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DFAT_RUNTIME=ON"
|
||||
"-DBUILD_AVX512=ON"
|
||||
"-DBUILD_STATIC_AND_SHARED=ON"
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
sed -i '/examples/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/lib
|
||||
mv $out/lib/*.a $dev/lib/
|
||||
ln -sf $out/lib/libhs.so $dev/lib/
|
||||
ln -sf $out/lib/libhs_runtime.so $dev/lib/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
sed -i "s,$out/include,$dev/include," $dev/lib/pkgconfig/libhs.pc
|
||||
sed -i "s,$out/lib,$dev/lib," $dev/lib/pkgconfig/libhs.pc
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "High-performance multiple regex matching library";
|
||||
longDescription = ''
|
||||
Hyperscan is a high-performance multiple regex matching library.
|
||||
It follows the regular expression syntax of the commonly-used
|
||||
libpcre library, but is a standalone library with its own C API.
|
||||
|
||||
Hyperscan uses hybrid automata techniques to allow simultaneous
|
||||
matching of large numbers (up to tens of thousands) of regular
|
||||
expressions and for the matching of regular expressions across
|
||||
streams of data.
|
||||
|
||||
Hyperscan is typically used in a DPI library stack.
|
||||
'';
|
||||
|
||||
homepage = https://www.hyperscan.io/;
|
||||
maintainers = with lib.maintainers; [ avnik ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
# gcc 4.8 optimisations break judy.
|
||||
# http://sourceforge.net/p/judy/mailman/message/31995144/
|
||||
# https://sourceforge.net/p/judy/mailman/message/31995144/
|
||||
preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
|
||||
configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
|
||||
'';
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
It is associated with GNU Binutils, and elsewhere often distributed with
|
||||
it.
|
||||
'';
|
||||
homepage = http://www.gnu.org/software/binutils/;
|
||||
homepage = https://www.gnu.org/software/binutils/;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ericson2314 ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
ISO-9660 filesystems (libiso9660), as well as utility
|
||||
programs such as an audio CD player and an extractor.
|
||||
'';
|
||||
homepage = http://www.gnu.org/software/libcdio/;
|
||||
homepage = https://www.gnu.org/software/libcdio/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./gets-undeclared.patch ./size_t.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gperf ];
|
||||
|
||||
|
||||
buildInputs =
|
||||
[ zlib bzip2 lzo
|
||||
libgcrypt
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
line. It is written in C and has Guile (Scheme) bindings.
|
||||
'';
|
||||
|
||||
homepage = http://nongnu.org/libchop/;
|
||||
homepage = https://www.nongnu.org/libchop/;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
url http://sourceforge.net/projects/libebook/files/
|
||||
url https://sourceforge.net/projects/libebook/files/
|
||||
SF_version_dir libe-book-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
||||
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
||||
user. It provides X authentication facilities for running
|
||||
programs in an X session.
|
||||
'';
|
||||
homepage = http://www.nongnu.org/gksu/;
|
||||
homepage = https://www.nongnu.org/gksu/;
|
||||
license = stdenv.lib.licenses.lgpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.romildo ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://gcc.gnu.org/;
|
||||
homepage = https://gcc.gnu.org/;
|
||||
license = licenses.lgpl2;
|
||||
description = "Collection of subroutines used by various GNU programs";
|
||||
maintainers = with maintainers; [ abbradar ericson2314 ];
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
applications.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/libiconv/;
|
||||
homepage = https://www.gnu.org/software/libiconv/;
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/libidn/;
|
||||
homepage = https://www.gnu.org/software/libidn/;
|
||||
description = "Library for internationalized domain names";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = licenses.lgpl2Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/libmicrohttpd/;
|
||||
homepage = https://www.gnu.org/software/libmicrohttpd/;
|
||||
|
||||
maintainers = with maintainers; [ eelco vrthra fpletz ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
url http://sourceforge.net/projects/libmwaw/files/libmwaw/
|
||||
url https://sourceforge.net/projects/libmwaw/files/libmwaw/
|
||||
SF_version_dir libmwaw-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
||||
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
name = "libnih-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
|
||||
url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
|
||||
sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
url http://sourceforge.net/projects/libwpd/files/libodfgen/
|
||||
url https://sourceforge.net/projects/libwpd/files/libodfgen/
|
||||
SF_version_dir libodfgen-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library from binutils for manipulating machine code";
|
||||
homepage = http://www.gnu.org/software/binutils/;
|
||||
homepage = https://www.gnu.org/software/binutils/;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ericson2314 ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
url http://sourceforge.net/projects/libwpd/files/librevenge/
|
||||
url https://sourceforge.net/projects/libwpd/files/librevenge/
|
||||
SF_version_dir librevenge-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsignon-glib";
|
||||
version = "unstable-2018-10-24";
|
||||
version = "2.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "py" ];
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/accounts-sso/${pname}";
|
||||
rev = "3639a2e90447e4640a03a44972560afe8f61aa48";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = ''
|
||||
A library for managing single signon credentials which can be used from GLib applications
|
||||
'';
|
||||
description = "A library for managing single signon credentials which can be used from GLib applications";
|
||||
homepage = https://gitlab.com/accounts-sso/libsignon-glib;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ worldofpeace ];
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true; # not cross;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/libsigsegv/;
|
||||
homepage = https://www.gnu.org/software/libsigsegv/;
|
||||
description = "Library to handle page faults in user mode";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gnu.org/software/libtasn1/;
|
||||
homepage = https://www.gnu.org/software/libtasn1/;
|
||||
description = "An ASN.1 library";
|
||||
longDescription = ''
|
||||
Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/libunistring/;
|
||||
homepage = https://www.gnu.org/software/libunistring/;
|
||||
|
||||
description = "Unicode string library";
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.nongnu.org/libunwind;
|
||||
homepage = https://www.nongnu.org/libunwind;
|
||||
description = "A portable and efficient API to determine the call-chain of a program";
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Library for rasterizing 2-D vector graphics";
|
||||
homepage = http://www.gnu.org/software/libxmi/;
|
||||
homepage = https://www.gnu.org/software/libxmi/;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
|
||||
maintainers = [ ];
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/lightning/;
|
||||
homepage = https://www.gnu.org/software/lightning/;
|
||||
description = "Run-time code generation library";
|
||||
longDescription = ''
|
||||
GNU lightning is a library that generates assembly language code
|
||||
|
||||
@@ -159,7 +159,7 @@ stdenv.mkDerivation rec {
|
||||
ported to OS/2 Warp!
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/ncurses/;
|
||||
homepage = https://www.gnu.org/software/ncurses/;
|
||||
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
ftgl, freetype}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencascade-oce-0.17.2";
|
||||
name = "opencascade-oce-0.18.3";
|
||||
src = fetchurl {
|
||||
url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz;
|
||||
sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd";
|
||||
url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz;
|
||||
sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5";
|
||||
};
|
||||
|
||||
buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl, fetchFromGitHub
|
||||
, fetchurl, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkgconfig, unzip, zlib, pcre, hdf5
|
||||
, glog, boost, google-gflags, protobuf
|
||||
, config
|
||||
@@ -31,29 +31,31 @@
|
||||
, enableDC1394 ? false, libdc1394
|
||||
, enableDocs ? false, doxygen, graphviz-nox
|
||||
|
||||
, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
|
||||
, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv";
|
||||
rev = version;
|
||||
sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
|
||||
sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr";
|
||||
};
|
||||
|
||||
contribSrc = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_contrib";
|
||||
rev = version;
|
||||
sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
|
||||
sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib";
|
||||
};
|
||||
|
||||
# Contrib must be built in order to enable Tesseract support:
|
||||
buildContrib = enableContrib || enableTesseract;
|
||||
|
||||
useSystemProtobuf = ! stdenv.isDarwin;
|
||||
|
||||
# See opencv/3rdparty/ippicv/ippicv.cmake
|
||||
ippicv = {
|
||||
src = fetchFromGitHub {
|
||||
@@ -145,6 +147,13 @@ stdenv.mkDerivation rec {
|
||||
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
|
||||
'';
|
||||
|
||||
patches =
|
||||
# https://github.com/opencv/opencv/pull/13254
|
||||
lib.optional enablePython (fetchpatch {
|
||||
url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
|
||||
sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
|
||||
});
|
||||
|
||||
# This prevents cmake from using libraries in impure paths (which
|
||||
# causes build failure on non NixOS)
|
||||
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
|
||||
@@ -171,7 +180,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ zlib pcre hdf5 glog boost google-gflags protobuf ]
|
||||
[ zlib pcre hdf5 glog boost google-gflags ]
|
||||
++ lib.optional useSystemProtobuf protobuf
|
||||
++ lib.optional enablePython pythonPackages.python
|
||||
++ lib.optional enableGtk2 gtk2
|
||||
++ lib.optional enableGtk3 gtk3
|
||||
@@ -197,7 +207,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals enableTesseract [ tesseract leptonica ]
|
||||
++ lib.optional enableTbb tbb
|
||||
++ lib.optional enableCuda cudatoolkit
|
||||
++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
|
||||
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
|
||||
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
|
||||
|
||||
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
|
||||
@@ -211,8 +221,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_OPENMP=ON"
|
||||
"-DBUILD_PROTOBUF=OFF"
|
||||
"-DPROTOBUF_UPDATE_FILES=ON"
|
||||
"-DBUILD_PROTOBUF=${printEnabled (!useSystemProtobuf)}"
|
||||
"-DPROTOBUF_UPDATE_FILES=${printEnabled useSystemProtobuf}"
|
||||
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
|
||||
"-DBUILD_TESTS=OFF"
|
||||
"-DBUILD_PERF_TESTS=OFF"
|
||||
@@ -234,6 +244,8 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DWITH_OPENCL=OFF"
|
||||
"-DWITH_LAPACK=OFF"
|
||||
] ++ lib.optionals enablePython [
|
||||
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -254,7 +266,8 @@ stdenv.mkDerivation rec {
|
||||
# ${exec_prefix}. This causes linker errors in downstream packages so we strip
|
||||
# of $out after the ${exec_prefix} prefix:
|
||||
postInstall = ''
|
||||
sed -i "s|\''${exec_prefix}/$out|\''${exec_prefix}|" "$out/lib/pkgconfig/opencv.pc"
|
||||
sed -i "s|{exec_prefix}/$out|{exec_prefix}|" \
|
||||
"$out/lib/pkgconfig/opencv.pc"
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
|
||||
307
pkgs/development/libraries/opencv/4.x.nix
Normal file
307
pkgs/development/libraries/opencv/4.x.nix
Normal file
@@ -0,0 +1,307 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkgconfig, unzip, zlib, pcre, hdf5
|
||||
, glog, boost, google-gflags, protobuf
|
||||
, config
|
||||
|
||||
, enableJPEG ? true, libjpeg
|
||||
, enablePNG ? true, libpng
|
||||
, enableTIFF ? true, libtiff
|
||||
, enableWebP ? true, libwebp
|
||||
, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
|
||||
, enableJPEG2K ? true, jasper
|
||||
, enableEigen ? true, eigen
|
||||
, enableOpenblas ? true, openblas
|
||||
, enableContrib ? true
|
||||
|
||||
, enableCuda ? (config.cudaSupport or false), cudatoolkit
|
||||
|
||||
, enableUnfree ? false
|
||||
, enableIpp ? false
|
||||
, enablePython ? false, pythonPackages
|
||||
, enableGtk2 ? false, gtk2
|
||||
, enableGtk3 ? false, gtk3
|
||||
, enableVtk ? false, vtk
|
||||
, enableFfmpeg ? false, ffmpeg
|
||||
, enableGStreamer ? false, gst_all_1
|
||||
, enableTesseract ? false, tesseract, leptonica
|
||||
, enableTbb ? false, tbb
|
||||
, enableOvis ? false, ogre
|
||||
, enableGPhoto2 ? false, libgphoto2
|
||||
, enableDC1394 ? false, libdc1394
|
||||
, enableDocs ? false, doxygen, graphviz-nox
|
||||
|
||||
, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv";
|
||||
rev = version;
|
||||
sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50";
|
||||
};
|
||||
|
||||
contribSrc = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_contrib";
|
||||
rev = version;
|
||||
sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
|
||||
};
|
||||
|
||||
# Contrib must be built in order to enable Tesseract support:
|
||||
buildContrib = enableContrib || enableTesseract || enableOvis;
|
||||
|
||||
# See opencv/3rdparty/ippicv/ippicv.cmake
|
||||
ippicv = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_3rdparty";
|
||||
rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4";
|
||||
sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp";
|
||||
} + "/ippicv";
|
||||
files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
{ ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; }
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then
|
||||
{ ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; }
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
{ ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; }
|
||||
else
|
||||
throw "ICV is not available for this platform (or not yet supported by this package)";
|
||||
dst = ".cache/ippicv";
|
||||
};
|
||||
|
||||
# See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake
|
||||
vgg = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_3rdparty";
|
||||
rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
|
||||
sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
|
||||
};
|
||||
files = {
|
||||
"vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179";
|
||||
"vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225";
|
||||
"vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5";
|
||||
"vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75";
|
||||
};
|
||||
dst = ".cache/xfeatures2d/vgg";
|
||||
};
|
||||
|
||||
# See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake
|
||||
boostdesc = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_3rdparty";
|
||||
rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
|
||||
sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
|
||||
};
|
||||
files = {
|
||||
"boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f";
|
||||
"boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191";
|
||||
"boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e";
|
||||
"boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f";
|
||||
"boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b";
|
||||
"boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea";
|
||||
"boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052";
|
||||
};
|
||||
dst = ".cache/xfeatures2d/boostdesc";
|
||||
};
|
||||
|
||||
# See opencv_contrib/modules/face/CMakeLists.txt
|
||||
face = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencv";
|
||||
repo = "opencv_3rdparty";
|
||||
rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12";
|
||||
sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v";
|
||||
};
|
||||
files = {
|
||||
"face_landmark_model.dat" = "7505c44ca4eb54b4ab1e4777cb96ac05";
|
||||
};
|
||||
dst = ".cache/data";
|
||||
};
|
||||
|
||||
# See opencv/modules/gapi/cmake/DownloadADE.cmake
|
||||
ade = rec {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/opencv/ade/archive/${name}";
|
||||
sha256 = "1r85vdkvcka7bcxk69pd0ai4hld4iakpj4xl0xbinx3p9pv5a4l8";
|
||||
};
|
||||
name = "v0.1.1d.zip";
|
||||
md5 = "37479d90e3a5d47f132f512b22cbe206";
|
||||
dst = ".cache/ade";
|
||||
};
|
||||
|
||||
# See opencv/cmake/OpenCVDownload.cmake
|
||||
installExtraFiles = extra : with lib; ''
|
||||
mkdir -p "${extra.dst}"
|
||||
'' + concatStrings (flip mapAttrsToList extra.files (name : md5 : ''
|
||||
ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
|
||||
''));
|
||||
installExtraFile = extra: ''
|
||||
mkdir -p "${extra.dst}"
|
||||
ln -s "${extra.src}" "${extra.dst}/${extra.md5}-${extra.name}"
|
||||
'';
|
||||
|
||||
opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
|
||||
|
||||
printEnabled = enabled : if enabled then "ON" else "OFF";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencv-${version}";
|
||||
inherit version src;
|
||||
|
||||
postUnpack = lib.optionalString buildContrib ''
|
||||
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
|
||||
'';
|
||||
|
||||
patches =
|
||||
# Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
|
||||
# PR: https://github.com/opencv/opencv_contrib/pull/1913
|
||||
lib.optional buildContrib (fetchpatch {
|
||||
url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch;
|
||||
sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
|
||||
stripLen = 2;
|
||||
extraPrefix = "opencv_contrib/";
|
||||
}) ++
|
||||
# https://github.com/opencv/opencv/pull/13254
|
||||
lib.optional enablePython (fetchpatch {
|
||||
url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
|
||||
sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
|
||||
});
|
||||
|
||||
# This prevents cmake from using libraries in impure paths (which
|
||||
# causes build failure on non NixOS)
|
||||
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
|
||||
# what appears to be some stray headers in dnn/misc/tensorflow
|
||||
# in contrib when generating the Python bindings:
|
||||
postPatch = ''
|
||||
sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
|
||||
sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
|
||||
'';
|
||||
|
||||
preConfigure =
|
||||
installExtraFile ade +
|
||||
lib.optionalString enableIpp (installExtraFiles ippicv) + (
|
||||
lib.optionalString buildContrib ''
|
||||
cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
|
||||
|
||||
${installExtraFiles vgg}
|
||||
${installExtraFiles boostdesc}
|
||||
${installExtraFiles face}
|
||||
'');
|
||||
|
||||
postConfigure = ''
|
||||
[ -e modules/core/version_string.inc ]
|
||||
echo '"(build info elided)"' > modules/core/version_string.inc
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ zlib pcre hdf5 glog boost google-gflags protobuf ]
|
||||
++ lib.optional enablePython pythonPackages.python
|
||||
++ lib.optional enableGtk2 gtk2
|
||||
++ lib.optional enableGtk3 gtk3
|
||||
++ lib.optional enableVtk vtk
|
||||
++ lib.optional enableJPEG libjpeg
|
||||
++ lib.optional enablePNG libpng
|
||||
++ lib.optional enableTIFF libtiff
|
||||
++ lib.optional enableWebP libwebp
|
||||
++ lib.optionals enableEXR [ openexr ilmbase ]
|
||||
++ lib.optional enableJPEG2K jasper
|
||||
++ lib.optional enableFfmpeg ffmpeg
|
||||
++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
|
||||
[ VideoDecodeAcceleration bzip2 ]
|
||||
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
|
||||
++ lib.optional enableOvis ogre
|
||||
++ lib.optional enableGPhoto2 libgphoto2
|
||||
++ lib.optional enableDC1394 libdc1394
|
||||
++ lib.optional enableEigen eigen
|
||||
++ lib.optional enableOpenblas openblas
|
||||
# There is seemingly no compile-time flag for Tesseract. It's
|
||||
# simply enabled automatically if contrib is built, and it detects
|
||||
# tesseract & leptonica.
|
||||
++ lib.optionals enableTesseract [ tesseract leptonica ]
|
||||
++ lib.optional enableTbb tbb
|
||||
++ lib.optional enableCuda cudatoolkit
|
||||
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
|
||||
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
|
||||
|
||||
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig unzip ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
||||
# Configure can't find the library without this.
|
||||
OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOPENCV_GENERATE_PKGCONFIG=ON"
|
||||
"-DWITH_OPENMP=ON"
|
||||
"-DBUILD_PROTOBUF=OFF"
|
||||
"-DPROTOBUF_UPDATE_FILES=ON"
|
||||
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
|
||||
"-DBUILD_TESTS=OFF"
|
||||
"-DBUILD_PERF_TESTS=OFF"
|
||||
"-DBUILD_DOCS=${printEnabled enableDocs}"
|
||||
(opencvFlag "IPP" enableIpp)
|
||||
(opencvFlag "TIFF" enableTIFF)
|
||||
(opencvFlag "JASPER" enableJPEG2K)
|
||||
(opencvFlag "WEBP" enableWebP)
|
||||
(opencvFlag "JPEG" enableJPEG)
|
||||
(opencvFlag "PNG" enablePNG)
|
||||
(opencvFlag "OPENEXR" enableEXR)
|
||||
(opencvFlag "CUDA" enableCuda)
|
||||
(opencvFlag "CUBLAS" enableCuda)
|
||||
(opencvFlag "TBB" enableTbb)
|
||||
] ++ lib.optionals enableCuda [
|
||||
"-DCUDA_FAST_MATH=ON"
|
||||
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
|
||||
"-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DWITH_OPENCL=OFF"
|
||||
"-DWITH_LAPACK=OFF"
|
||||
] ++ lib.optionals enablePython [
|
||||
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postBuild = lib.optionalString enableDocs ''
|
||||
make doxygen
|
||||
'';
|
||||
|
||||
# By default $out/lib/pkgconfig/opencv4.pc looks something like this:
|
||||
#
|
||||
# prefix=/nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0
|
||||
# exec_prefix=${prefix}
|
||||
# libdir=${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib
|
||||
# includedir_old=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4/opencv
|
||||
# includedir_new=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4
|
||||
# ...
|
||||
# Libs: -L${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib ...
|
||||
# Note that ${exec_prefix} is set to $out but that $out is also appended to
|
||||
# ${exec_prefix}. This causes linker errors in downstream packages so we strip
|
||||
# of $out after the ${exec_prefix} and ${prefix} prefixes:
|
||||
postInstall = ''
|
||||
sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
|
||||
"$out/lib/pkgconfig/opencv4.pc"
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
|
||||
passthru = lib.optionalAttrs enablePython { pythonPath = []; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open Computer Vision Library with more than 500 algorithms";
|
||||
homepage = https://opencv.org/;
|
||||
license = with licenses; if enableUnfree then unfree else bsd3;
|
||||
maintainers = with maintainers; [mdaiter basvandijk];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
homepage = http://www.gnu.org/software/osip/;
|
||||
homepage = https://www.gnu.org/software/osip/;
|
||||
description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.nongnu.org/pngpp/;
|
||||
homepage = https://www.nongnu.org/pngpp/;
|
||||
description = "C++ wrapper for libpng library";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The GNU Portable Threads library";
|
||||
homepage = http://www.gnu.org/software/pth;
|
||||
homepage = https://www.gnu.org/software/pth;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@@ -46,7 +46,7 @@ let
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||
|
||||
patches = {
|
||||
qtbase = [ ./qtbase.patch ];
|
||||
qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ];
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
|
||||
30
pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
Normal file
30
pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 0bbc871..3673634 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ set(imported_location \"${PLUGIN_LOCATION}\")
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
set_target_properties(Qt5::${Plugin} PROPERTIES
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
index 5baf0fd..3583745 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
@@ -2,10 +2,10 @@
|
||||
add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
|
||||
|
||||
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
!!ENDIF
|
||||
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
|
||||
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
|
||||
@@ -38,7 +38,7 @@ let
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||
|
||||
patches = {
|
||||
qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
|
||||
qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
|
||||
30
pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
Normal file
30
pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 0bbc871..3673634 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ set(imported_location \"${PLUGIN_LOCATION}\")
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
set_target_properties(Qt5::${Plugin} PROPERTIES
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
index 5baf0fd..3583745 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
@@ -2,10 +2,10 @@
|
||||
add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
|
||||
|
||||
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
!!ENDIF
|
||||
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
|
||||
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
|
||||
desire its capabilities.
|
||||
'';
|
||||
|
||||
homepage = http://savannah.gnu.org/projects/readline/;
|
||||
homepage = https://savannah.gnu.org/projects/readline/;
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
desire its capabilities.
|
||||
'';
|
||||
|
||||
homepage = http://savannah.gnu.org/projects/readline/;
|
||||
homepage = https://savannah.gnu.org/projects/readline/;
|
||||
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
desire its capabilities.
|
||||
'';
|
||||
|
||||
homepage = http://savannah.gnu.org/projects/readline/;
|
||||
homepage = https://savannah.gnu.org/projects/readline/;
|
||||
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = ''
|
||||
#!${stdenv.shell}
|
||||
cd ${toString ./.}
|
||||
${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix
|
||||
'';
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, google-gflags, which
|
||||
, lsb-release, glog, protobuf, cbc, zlib }:
|
||||
, lsb-release, glog, protobuf, cbc, zlib, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "or-tools-${version}";
|
||||
version = "v6.9.1";
|
||||
version = "v6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "or-tools";
|
||||
rev = version;
|
||||
sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
|
||||
sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2";
|
||||
};
|
||||
|
||||
# The original build system uses cmake which does things like pull
|
||||
@@ -25,32 +25,23 @@ stdenv.mkDerivation rec {
|
||||
EOF
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make cc
|
||||
'';
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
buildFlags = [ "cc" ];
|
||||
|
||||
installPhase = ''
|
||||
make install_cc prefix=$out
|
||||
'';
|
||||
checkTarget = "test_cc";
|
||||
doCheck = true;
|
||||
|
||||
patches = [
|
||||
# In "expected" way of compilation, the glog package is compiled
|
||||
# with gflags support which then makes gflags header transitively
|
||||
# included through glog. However in nixpkgs we don't compile glog
|
||||
# with gflags so we have to include it ourselves. Upstream should
|
||||
# always include gflags to support both ways I think.
|
||||
#
|
||||
# Upstream ticket: https://github.com/google/or-tools/issues/902
|
||||
./gflags-include.patch
|
||||
];
|
||||
installTargets = [ "install_cc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake lsb-release which zlib
|
||||
cmake lsb-release which zlib python3
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
google-gflags glog protobuf cbc
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/google/or-tools;
|
||||
license = licenses.asl20;
|
||||
|
||||
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
|
||||
# add pkgconfig file
|
||||
./2.6.2-add-pkgconfig.patch
|
||||
|
||||
# http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
|
||||
# https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
|
||||
./2.6.2-entity.patch
|
||||
|
||||
# Use CC, CXX, and LD from environment
|
||||
|
||||
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with maintainers; [ edwtjo phreedom ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "C++ library to facilitate using C++ design patterns";
|
||||
homepage = http://www.gnu.org/software/commoncpp/;
|
||||
homepage = https://www.gnu.org/software/commoncpp/;
|
||||
license = stdenv.lib.licenses.lgpl3Plus;
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
propagatedBuildInputs = [ libcdio ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://www.gnu.org/software/vcdimager/;
|
||||
homepage = https://www.gnu.org/software/vcdimager/;
|
||||
description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
|
||||
Reference in New Issue
Block a user