Merge branch 'master' into HEAD
This commit is contained in:
Nikolay Amiantov
@@ -1,14 +1,14 @@
|
||||
{ stdenv, agda, fetchFromGitHub, ghcWithPackages }:
|
||||
|
||||
agda.mkDerivation (self: rec {
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
name = "agda-stdlib-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "agda-stdlib";
|
||||
owner = "agda";
|
||||
rev = "v${version}";
|
||||
sha256 = "156xbqvqjck9izz613v52ppwk8s1y0kv7xkjpcm16vys2c3bh0x5";
|
||||
sha256 = "0qx72w6lwskp18q608f95j5dcxb9xr4q4mzdkxp01sgib8v2v56l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
|
||||
|
||||
@@ -1,33 +1,25 @@
|
||||
{stdenv, fetchurl, unzip}:
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
# The 'src' 7.0.0.3 expects amrwb 700, but there is only 710 available now,
|
||||
# so I guess in 3gpp they updated to 7.1.0, but amrwb did not update the libraries.
|
||||
# I guess amrwb uses the first version numbers to match those of 3gpp,
|
||||
# so I set the name to 7.1.0.3 in this case
|
||||
name = "amrwb-7.1.0.3";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "amrwb-${version}";
|
||||
version = "11.0.0.0";
|
||||
|
||||
srcAmr = fetchurl {
|
||||
url = http://www.3gpp.org/ftp/Specs/latest/Rel-7/26_series/26204-710.zip;
|
||||
sha256 = "1wnx72m20y8bdlyndyy8rskr0hi4llk1h1hcr34awxfmi9l4922i";
|
||||
url = http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip;
|
||||
sha256 = "1v4zhs6f1mf1xkrzhljh05890in0rpr5d5pcak9h4igxhd2c91f8";
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.penguin.cz/~utx/ftp/amr/amrwb-7.0.0.3.tar.bz2;
|
||||
sha256 = "0nn94i3gw3d5fgks43wdhshdlhpd4rcrzj46f2vsby0viwkxxp8z";
|
||||
url = "http://www.penguin.cz/~utx/ftp/amr/amrwb-${version}.tar.bz2";
|
||||
sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i s/26204-700/26204-710/g Makefile.am Makefile.in configure configure.ac \
|
||||
prepare_sources.sh.in
|
||||
'';
|
||||
|
||||
configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
|
||||
|
||||
postConfigure = ''
|
||||
cp $srcAmr 26204-710.zip
|
||||
cp $srcAmr 26204-b00.zip
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
{ stdenv, fetchgit, cairo, libjpeg, libXft, pkgconfig, python2 }:
|
||||
{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ntk-${version}";
|
||||
version = "2017-04-22";
|
||||
src = fetchgit {
|
||||
url = "git://git.tuxfamily.org/gitroot/non/fltk.git";
|
||||
rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff";
|
||||
sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq";
|
||||
version = "1.3.1000";
|
||||
src = fetchFromGitHub {
|
||||
owner = "original-male";
|
||||
repo = "ntk";
|
||||
rev = "v${version}";
|
||||
sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
version = "${version}";
|
||||
homepage = http://non.tuxfamily.org/;
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "babl-0.1.28";
|
||||
name = "babl-0.1.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
|
||||
sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3";
|
||||
sha256 = "0nwakj313l2dh5npx18avkg4z17i2prkxbl6vj547a08n6ry1gsy";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "check-${version}";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
|
||||
sha256 = "0lhhywf5nxl3dd0hdakra3aasl590756c9kmvyifb3vgm9k0gxgm";
|
||||
url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz";
|
||||
sha256 = "05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4";
|
||||
};
|
||||
|
||||
# Test can randomly fail: http://hydra.nixos.org/build/7243912
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
can be used within source code editors and IDEs.
|
||||
'';
|
||||
|
||||
homepage = http://check.sourceforge.net/;
|
||||
homepage = https://libcheck.github.io/check/;
|
||||
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
|
||||
&& libSM != null;
|
||||
|
||||
let
|
||||
version = "1.10.22";
|
||||
sha256 = "15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2";
|
||||
version = "1.10.24";
|
||||
sha256 = "06ydmrg76l1kwl3190d72zpiy3qxy248x6gskxbj9qiqfsr4w63i";
|
||||
|
||||
self = stdenv.mkDerivation {
|
||||
name = "dbus-${version}";
|
||||
|
||||
@@ -15,25 +15,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Prevent the manpage builds from attempting to access the Internet.
|
||||
prePatch = ''
|
||||
substituteInPlace cmake_admin/CreateManpages.cmake --replace \
|
||||
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
|
||||
${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl
|
||||
|
||||
for xml in doc/*.xml.in; do
|
||||
substituteInPlace "$xml" --replace \
|
||||
http://www.docbook.org/xml/4.5/docbookx.dtd \
|
||||
${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd
|
||||
done
|
||||
'';
|
||||
|
||||
#Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket
|
||||
postInstall = ''
|
||||
rm $out/bin/drumstick-vpiano
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ];
|
||||
buildInputs = [
|
||||
alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg
|
||||
];
|
||||
|
||||
23
pkgs/development/libraries/easyloggingpp/default.nix
Normal file
23
pkgs/development/libraries/easyloggingpp/default.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, gtest }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "easyloggingpp-${version}";
|
||||
version = "9.95.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "muflihun";
|
||||
repo = "easyloggingpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq";
|
||||
};
|
||||
nativeBuildInputs = [cmake];
|
||||
buildInputs = [gtest];
|
||||
cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"];
|
||||
NIX_CFLAGS_COMPILE = "-std=c++11" +
|
||||
stdenv.lib.optionalString stdenv.isLinux " -pthread";
|
||||
meta = {
|
||||
description = "C++ logging library";
|
||||
homepage = https://muflihun.github.io/easyloggingpp/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [acowley];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig
|
||||
{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ ffmpeg libpng ];
|
||||
buildInputs = [ ffmpeg libpng libjpeg ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/dirkvdb/ffmpegthumbnailer;
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip
|
||||
, dbus, dbus_glib, modemmanager, avahi
|
||||
, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geoclue-2.4.3";
|
||||
name = "geoclue-2.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
|
||||
sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd";
|
||||
sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
pkgconfig intltool wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = libintlOrEmpty ++
|
||||
[ intltool glib json_glib libsoup geoip
|
||||
[ glib json_glib libsoup geoip
|
||||
dbus dbus_glib avahi
|
||||
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
|
||||
|
||||
propagatedBuildInputs = [ dbus dbus_glib glib ];
|
||||
propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Geolocation framework and some data providers";
|
||||
|
||||
@@ -43,7 +43,7 @@ let
|
||||
'';
|
||||
|
||||
ver_maj = "2.54";
|
||||
ver_min = "0";
|
||||
ver_min = "1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a";
|
||||
sha256 = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3";
|
||||
};
|
||||
|
||||
patches = optional stdenv.isDarwin ./darwin-compilation.patch
|
||||
|
||||
@@ -13,7 +13,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
ver_maj = "3.22";
|
||||
ver_min = "21";
|
||||
ver_min = "24";
|
||||
version = "${ver_maj}.${ver_min}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
|
||||
sha256 = "1bd3c1a85cfb4db112cabb5379abb05a1a94fe43052d309d573493fca00e6b87";
|
||||
sha256 = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
37
pkgs/development/libraries/hotpatch/default.nix
Normal file
37
pkgs/development/libraries/hotpatch/default.nix
Normal file
@@ -0,0 +1,37 @@
|
||||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hotpatch-0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vikasnkumar";
|
||||
repo = "hotpatch";
|
||||
rev = "4b65e3f275739ea5aa798d4ad083c4cb10e29149";
|
||||
sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace test/loader.c \
|
||||
--replace \"/lib64/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--replace \"/lib/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--replace \"/lib/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--replace \"/lib32/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
LD_LIBRARY_PATH=$(pwd)/src make test
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Hot patching executables on Linux using .so file injection";
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.gnidorah ];
|
||||
platforms = ["i686-linux" "x86_64-linux"];
|
||||
};
|
||||
}
|
||||
14
pkgs/development/libraries/icu/58.nix
Normal file
14
pkgs/development/libraries/icu/58.nix
Normal file
@@ -0,0 +1,14 @@
|
||||
args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
|
||||
let
|
||||
keywordFix = fetchurl {
|
||||
url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
|
||||
name = "icu-changeset-39484.diff";
|
||||
sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
|
||||
};
|
||||
in
|
||||
import ./base.nix {
|
||||
version = "58.2";
|
||||
sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
|
||||
patches = [ keywordFix ];
|
||||
patchFlags = "-p4";
|
||||
} args
|
||||
4
pkgs/development/libraries/icu/59.nix
Normal file
4
pkgs/development/libraries/icu/59.nix
Normal file
@@ -0,0 +1,4 @@
|
||||
import ./base.nix {
|
||||
version = "59.1";
|
||||
sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki";
|
||||
}
|
||||
@@ -1,16 +1,8 @@
|
||||
{ version, sha256, patches ? [], patchFlags ? "" }:
|
||||
{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
|
||||
|
||||
let
|
||||
pname = "icu4c";
|
||||
version = "58.2";
|
||||
|
||||
# this patch should no longer be needed in 58.3
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=599142#c14
|
||||
keywordFix = fetchurl {
|
||||
url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
|
||||
name = "icu-changeset-39484.diff";
|
||||
sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = pname + "-" + version;
|
||||
@@ -18,7 +10,7 @@ stdenv.mkDerivation {
|
||||
src = fetchurl {
|
||||
url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
|
||||
+ (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
|
||||
sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@@ -33,9 +25,7 @@ stdenv.mkDerivation {
|
||||
echo Source root reset to ''${sourceRoot}
|
||||
'';
|
||||
|
||||
patchFlags = "-p4";
|
||||
|
||||
patches = [ keywordFix ];
|
||||
inherit patchFlags patches;
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
|
||||
@@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jansson-2.9";
|
||||
name = "jansson-2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.digip.org/jansson/releases/${name}.tar.gz";
|
||||
sha256 = "19fjgfwjfj99rqa3kf96x5rssj88siazggksgrikd6h4r9sd1l0a";
|
||||
sha256 = "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
29
pkgs/development/libraries/kdb/default.nix
Normal file
29
pkgs/development/libraries/kdb/default.nix
Normal file
@@ -0,0 +1,29 @@
|
||||
{
|
||||
mkDerivation, lib, fetchurl,
|
||||
extra-cmake-modules,
|
||||
qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kdb";
|
||||
version = "3.0.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
|
||||
sha256 = "1n11xhqk3sf4a5nzvnrnj7bj21yqqqkm2d1xzfx3q82fkyah8s49";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ];
|
||||
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A database connectivity and creation framework for various database vendors";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
};
|
||||
}
|
||||
29
pkgs/development/libraries/kmsxx/default.nix
Normal file
29
pkgs/development/libraries/kmsxx/default.nix
Normal file
@@ -0,0 +1,29 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kmsxx-2017-10-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomba";
|
||||
repo = "kmsxx";
|
||||
fetchSubmodules = true;
|
||||
rev = "f32b82c17cd357ae1c8ed2636266113955293feb";
|
||||
sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ libdrm python ];
|
||||
|
||||
pythonPath = [ ];
|
||||
passthru.python = python;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
|
||||
homepage = https://github.com/tomba/kmsxx;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ gnidorah ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
29
pkgs/development/libraries/kproperty/default.nix
Normal file
29
pkgs/development/libraries/kproperty/default.nix
Normal file
@@ -0,0 +1,29 @@
|
||||
{
|
||||
mkDerivation, lib, fetchurl,
|
||||
extra-cmake-modules,
|
||||
qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kproperty";
|
||||
version = "3.0.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
|
||||
sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ];
|
||||
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A property editing framework with editor widget similar to what is known from Qt Designer";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
};
|
||||
}
|
||||
27
pkgs/development/libraries/kreport/default.nix
Normal file
27
pkgs/development/libraries/kreport/default.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
mkDerivation, lib, fetchurl,
|
||||
extra-cmake-modules,
|
||||
qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kreport";
|
||||
version = "3.0.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
|
||||
sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python2 ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A framework for creation and generation of reports in multiple formats";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
};
|
||||
}
|
||||
@@ -29,7 +29,7 @@ let
|
||||
result = {
|
||||
libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
|
||||
libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00";
|
||||
libav_12 = libavFun "12.1" "df048240318b888e3938f649422b967f62e43e3c";
|
||||
libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5";
|
||||
};
|
||||
|
||||
libavFun = version : sha1 : stdenv.mkDerivation rec {
|
||||
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
|
||||
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
|
||||
|
||||
configureFlags = [ ]
|
||||
configureFlags = [ "--enable-install-test-programs" ]
|
||||
++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin "-C";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl
|
||||
, libssh2, libidn, libpsl, openldap }:
|
||||
, libidn }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.54.1";
|
||||
@@ -12,20 +12,20 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ perl gnutls gss openssl zlib libidn libssh2 libpsl openldap ];
|
||||
buildInputs = [ perl gnutls gss openssl zlib libidn ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-zlib"
|
||||
"--with-gssapi"
|
||||
"--with-libssh2"
|
||||
"--with-libidn"
|
||||
"--with-libpsl"
|
||||
"--enable-ldap"
|
||||
"--enable-ldaps"
|
||||
"--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn"
|
||||
"--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl"
|
||||
"--without-polarssl" "--without-ssl" "--without-winssl"
|
||||
"--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap"
|
||||
"--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp"
|
||||
"--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher"
|
||||
"--disable-file" "--disable-ftp" "--disable-smb"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -4,11 +4,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libidn2-${version}";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
|
||||
sha256 = "1k88acdf242a6lbznr0h6f02frsqyqw4smw1nznibim5wyf18da3";
|
||||
sha256 = "1w6jycr5bbawimhb72wxf9ic92yrhfadahfj0b70myw5n81nnjv4";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libebml }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libmatroska-1.4.7";
|
||||
name = "libmatroska-1.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2";
|
||||
sha256 = "1yi5cnv13nhl27xyqayd5l3sf0j3swfj3apzibv71yg9pariwi26";
|
||||
url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz";
|
||||
sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.97";
|
||||
version = "0.7.99";
|
||||
name = "libmediainfo-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
|
||||
sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld";
|
||||
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
|
||||
sha256 = "126nkxrzs6dxzm3hzx6smvw6xgrqr3zs6hdqvl2xmvqy10p8z6pc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Shared library for mediainfo";
|
||||
homepage = http://mediaarea.net/;
|
||||
homepage = https://mediaarea.net/;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.devhell ];
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
assert zlib != null;
|
||||
|
||||
let
|
||||
version = "1.6.31";
|
||||
patchVersion = "1.6.31";
|
||||
sha256 = "0hcbxv9qf4f9q7brrk0ndag526glr8lii43grssv45j9w0nn0ai3";
|
||||
version = "1.6.34";
|
||||
patchVersion = "1.6.34";
|
||||
sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
|
||||
patch_src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
|
||||
sha256 = "0f10ih658j514vpvsli0pk378vcmjn78g52cssyg92r4k1r19rla";
|
||||
sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
|
||||
};
|
||||
whenPatched = stdenv.lib.optionalString apngSupport;
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libqalculate-${version}";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
|
||||
sha256 = "1ziw48djccsgfcjd1h3834sihr89pyb3mna096cpm47bc71saqvh";
|
||||
sha256 = "036f284bssvavyz6pgpcdafvxa59h2wdrh8xl7nmxxnw9v7n2n7l";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
28
pkgs/development/libraries/librime/default.nix
Normal file
28
pkgs/development/libraries/librime/default.nix
Normal file
@@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
|
||||
libyamlcpp, gmock }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "librime-${version}";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rime";
|
||||
repo = "librime";
|
||||
rev = "rime-${version}";
|
||||
sha256 = "14jgnfm61ynm086x9v7wfmv2p14h0qp8lq4d2jqm21n821jsraj6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://rime.im/;
|
||||
description = "Rime Input Method Engine, the core library";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ sifmelcara ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libsodium-1.0.13";
|
||||
name = "libsodium-1.0.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
|
||||
sha256 = "1z93wfg4k5svg8yck6cgdr6ysj91kbpn03nyzwxanncy3b5sq4ww";
|
||||
sha256 = "1x3qw7lsz44vcxpcn1dvwig410phg6gmv31jwj94arrgka3rwspv";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
24
pkgs/development/libraries/libubox/default.nix
Normal file
24
pkgs/development/libraries/libubox/default.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libubox-2017-09-29";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.openwrt.org/project/libubox.git";
|
||||
rev = "632688e8d6cde32781e4ec685d59afb0938300ad";
|
||||
sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ json_c ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C utility functions for OpenWrt";
|
||||
homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
}
|
||||
@@ -2,14 +2,14 @@
|
||||
, ApplicationServices, CoreServices }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
name = "libuv-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libuv";
|
||||
repo = "libuv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1121qvnvpcabq1bl2k41jq8r2hn2x123csiaf7s9vrq66bbxgfdx";
|
||||
sha256 = "092hxqjvbb6d03h3msc38359w2kixba1ansyrsbyqq8iqiqwnkw0";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
|
||||
@@ -5,7 +5,7 @@ diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
|
||||
ifeq ($(BACKEND),x86emu)
|
||||
OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
|
||||
x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o
|
||||
+ CFLAGS += -DX86EMU
|
||||
+ CFLAGS += -DX86EMU -fno-delete-null-pointer-checks
|
||||
else
|
||||
OBJECTS += lrmi.o
|
||||
endif
|
||||
|
||||
@@ -1,16 +1,24 @@
|
||||
{stdenv, fetchurl}:
|
||||
{stdenv, fetchurl, fetchpatch}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libxdg-basedir-1.0.2";
|
||||
name = "libxdg-basedir-1.2.0";
|
||||
src = fetchurl {
|
||||
url = "http://n.ethz.ch/student/nevillm/download/libxdg-basedir/${name}.tar.gz";
|
||||
sha256 = "0fibbzba228gdk05lfi8cgfrsp80a2gnjbwka0pzpkig0fz8pp9i";
|
||||
url = "https://nevill.ch/libxdg-basedir/downloads/${name}.tar.gz";
|
||||
sha256 = "2757a949618742d80ac59ee2f0d946adc6e71576406cdf798e6ced507708cdf4";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://n.ethz.ch/student/nevillm/download/libxdg-basedir/;
|
||||
patches = [
|
||||
# Overflow bug
|
||||
(fetchpatch {
|
||||
url = "https://github.com/devnev/libxdg-basedir/commit/14e000f696ef8b83264b0ca4407669bdb365fb23.patch";
|
||||
sha256 = "0lpy1ijir0x0hhb0fz0w5vxy1wl1cw9kkd6gva0rkp41i6vrp2wq";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/devnev/libxdg-basedir;
|
||||
description = "Implementation of the XDG Base Directory specification";
|
||||
license = "BSD";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchzip
|
||||
{ stdenv, fetchzip, fetchpatch
|
||||
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
|
||||
, libwebp, libxml2, proj, python2, scons, sqlite, zlib
|
||||
|
||||
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065";
|
||||
};
|
||||
|
||||
patches = [(fetchpatch {
|
||||
name = "icu-59.diff";
|
||||
url = https://github.com/mapnik/mapnik/commit/9e58c890430d.diff;
|
||||
sha256 = "0h546qq8g19gw9s4979hla9vkq5kcwh3q45ryajyjhmlr2z9fi6p";
|
||||
})];
|
||||
|
||||
# a distinct dev output makes python-mapnik fail
|
||||
outputs = [ "out" ];
|
||||
|
||||
|
||||
21
pkgs/development/libraries/marisa/default.nix
Normal file
21
pkgs/development/libraries/marisa/default.nix
Normal file
@@ -0,0 +1,21 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "marisa-${version}";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/marisa-${version}.tar.gz";
|
||||
sha256 = "1cwzf8hr348zihkiy0qckx0n6rxg7sy113xhbslb1irw1pvs99v7";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://code.google.com/p/marisa-trie/;
|
||||
description = "Static and space-efficient trie data structure library";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ sifmelcara ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, fetchpatch, lib
|
||||
, pkgconfig, intltool, autoreconfHook, substituteAll
|
||||
, file, expat, libdrm, xorg, wayland, openssl
|
||||
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
|
||||
, llvmPackages, libffi, libomxil-bellagio, libva
|
||||
, libelf, libvdpau, valgrind-light
|
||||
, libelf, libvdpau, valgrind-light, python2
|
||||
, grsecEnabled ? false
|
||||
, enableRadv ? false
|
||||
, enableRadv ? true
|
||||
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
|
||||
# It's overridden for mesa_drivers.
|
||||
, enableTextureFloats ? false
|
||||
@@ -36,7 +36,7 @@ let
|
||||
then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
|
||||
else if stdenv.isAarch64
|
||||
then ["nouveau" "vc4" ]
|
||||
else ["i915" "r300" "r600" "radeonsi" "nouveau"];
|
||||
else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
|
||||
defaultDriDrivers =
|
||||
if (stdenv.isArm || stdenv.isAarch64)
|
||||
then ["nouveau"]
|
||||
@@ -51,8 +51,7 @@ let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
|
||||
|
||||
let
|
||||
galliumDrivers =
|
||||
["svga"]
|
||||
++ (if gallium_ == null
|
||||
(if gallium_ == null
|
||||
then defaultGalliumDrivers
|
||||
else gallium_)
|
||||
++ ["swrast"];
|
||||
@@ -67,7 +66,7 @@ let
|
||||
in
|
||||
|
||||
let
|
||||
version = "17.1.10";
|
||||
version = "17.2.2";
|
||||
branch = head (splitString "." version);
|
||||
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
|
||||
in
|
||||
@@ -82,7 +81,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 = "cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb";
|
||||
sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng";
|
||||
};
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
@@ -150,9 +149,9 @@ stdenv.mkDerivation {
|
||||
expat llvmPackages.llvm
|
||||
glproto dri2proto dri3proto presentproto
|
||||
libX11 libXext libxcb libXt libXfixes libxshmfence
|
||||
libffi wayland libvdpau libelf libXvMC
|
||||
libffi wayland wayland-protocols libvdpau libelf libXvMC
|
||||
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
|
||||
valgrind-light
|
||||
valgrind-light python2
|
||||
];
|
||||
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl
|
||||
, CoreServices ? null }:
|
||||
|
||||
let version = "4.15"; in
|
||||
let version = "4.16"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nspr-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
|
||||
sha256 = "101dksqm1z0hzd7ap82ccbxjr48s6q3xhshdl81qkj6hqdmy1p97";
|
||||
sha256 = "1l9wlnb9y0bzicv448jjl9kssqn044dc2qrkwzp4ll35fvch4ccv";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "nss-${version}";
|
||||
version = "3.31";
|
||||
version = "3.32.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz";
|
||||
sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9";
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_32_1_RTM/src/${name}.tar.gz";
|
||||
sha256 = "0lj6c94102aa81bnjisnix09zfjly9aa1d6vrzxmcjmzynkrrrad";
|
||||
};
|
||||
|
||||
buildInputs = [ perl zlib sqlite ];
|
||||
@@ -25,37 +25,13 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
patches =
|
||||
[ # Install a nss.pc (pkgconfig) file and nss-config script
|
||||
# Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
|
||||
(fetchurl {
|
||||
name = "nss-3.28-gentoo-fixups.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/"
|
||||
+ "dev-libs/nss/files/nss-3.28-gentoo-fixups.patch"
|
||||
+ "?id=05c31f8cca591b3ce8219e4def7c26c7b1b130d6";
|
||||
sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q";
|
||||
})
|
||||
[
|
||||
# Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
|
||||
./85_security_load.patch
|
||||
];
|
||||
|
||||
patchFlags = "-p0";
|
||||
|
||||
postPatch = ''
|
||||
# Fix up the patch from Gentoo.
|
||||
sed -i \
|
||||
-e "/^PREFIX =/s|= /usr|= $out|" \
|
||||
-e '/@libdir@/s|gentoo/nss|lib|' \
|
||||
-e '/ln -sf/d' \
|
||||
nss/config/Makefile
|
||||
|
||||
# Note for spacing/tab nazis: The TAB characters are intentional!
|
||||
cat >> nss/config/Makefile <<INSTALL_TARGET
|
||||
install:
|
||||
mkdir -p \$(DIST)/lib/pkgconfig
|
||||
cp nss.pc \$(DIST)/lib/pkgconfig
|
||||
INSTALL_TARGET
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "tools" ];
|
||||
|
||||
preConfigure = "cd nss";
|
||||
@@ -79,9 +55,31 @@ in stdenv.mkDerivation rec {
|
||||
mv $out/*.OBJ/* $out/
|
||||
rmdir $out/*.OBJ
|
||||
|
||||
cp -av config/nss-config $out/bin/nss-config
|
||||
|
||||
ln -s lib $out/lib64
|
||||
|
||||
# Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a
|
||||
NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'`
|
||||
NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'`
|
||||
NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'`
|
||||
PREFIX="$out"
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
sed -e "s,%prefix%,$PREFIX," \
|
||||
-e "s,%exec_prefix%,$PREFIX," \
|
||||
-e "s,%libdir%,$PREFIX/lib64," \
|
||||
-e "s,%includedir%,$dev/include/nss," \
|
||||
-e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \
|
||||
-e "s,%NSPR_VERSION%,4.16,g" \
|
||||
pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc
|
||||
chmod 0644 $out/lib/pkgconfig/nss.pc
|
||||
|
||||
sed -e "s,@prefix@,$PREFIX," \
|
||||
-e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \
|
||||
-e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \
|
||||
-e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \
|
||||
pkg/pkg-config/nss-config.in > $out/bin/nss-config
|
||||
chmod 0755 $out/bin/nss-config
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
prePatch = stdenv.lib.optional stdenv.isDarwin ''
|
||||
substituteInPlace cmake/dist.cmake \
|
||||
--replace '@executable_path/''${UP_DIR}/''${INSTALL_LIB}' $out'/''${INSTALL_LIB}'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/kkos/oniguruma;
|
||||
description = "Regular expressions library";
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
, enableGtk3 ? false, gtk3
|
||||
, enableFfmpeg ? false, ffmpeg
|
||||
, enableGStreamer ? false, gst_all_1
|
||||
, enableEigen ? false, eigen
|
||||
, enableOpenblas ? false, openblas
|
||||
, enableEigen ? true, eigen
|
||||
, enableOpenblas ? true, openblas
|
||||
, enableCuda ? false, cudatoolkit, gcc5
|
||||
, enableTesseract ? false, tesseract, leptonica
|
||||
, AVFoundation, Cocoa, QTKit
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, enableJPEG2K ? true, jasper
|
||||
, enableFfmpeg ? false, ffmpeg
|
||||
, enableGStreamer ? false, gst_all
|
||||
, enableEigen ? false, eigen
|
||||
, enableEigen ? true, eigen
|
||||
, darwin
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,34 +1,29 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
|
||||
{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
|
||||
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pcl-1.8.0";
|
||||
name = "pcl-1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PointCloudLibrary";
|
||||
repo = "pcl";
|
||||
rev = name;
|
||||
sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll";
|
||||
sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ cmake qhull flann boost eigen libusb1 libpcap
|
||||
libpng vtk qt4 libXt ]
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ qhull flann boost eigen libusb1 libpcap
|
||||
libpng vtk qtbase libXt ]
|
||||
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
|
||||
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
|
||||
"-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET="
|
||||
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
|
||||
];
|
||||
|
||||
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g")
|
||||
sed -i 's,^\( target_link_libraries("''${LIB_NAME}" "-framework Cocoa")\),\1\n target_link_libraries("''${LIB_NAME}" "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"),' visualization/CMakeLists.txt
|
||||
sed -i 's,^\(set(SUBSYS_DEPS common io kdtree geometry search)\),\1\nset(CMAKE_OSX_SYSROOT "")\nset(CMAKE_OSX_DEPLOYMENT_TARGET ""),' visualization/CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://pointclouds.org/;
|
||||
description = "Open project for 2D/3D image and point cloud processing";
|
||||
|
||||
@@ -7,6 +7,9 @@ with lib;
|
||||
|
||||
let
|
||||
v = "4.9.1";
|
||||
|
||||
soname = if withQt5 then "phonon4qt5" else "phonon";
|
||||
buildsystemdir = "share/cmake/${soname}";
|
||||
in
|
||||
|
||||
assert withQt5 -> qtbase != null;
|
||||
@@ -36,17 +39,41 @@ stdenv.mkDerivation rec {
|
||||
[ cmake pkgconfig ]
|
||||
++ optional withQt5 extra-cmake-modules;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fPIC";
|
||||
|
||||
cmakeFlags =
|
||||
[ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
|
||||
++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"
|
||||
cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix"
|
||||
cmakeFlags+=" -DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
sed -i PhononConfig.cmake.in \
|
||||
-e "/get_filename_component(rootDir/ s/^.*$//" \
|
||||
-e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \
|
||||
-e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \
|
||||
-e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev},"
|
||||
-e "/^set(PHONON_INCLUDE_DIR/ s|\''${rootDir}/||" \
|
||||
-e "/^set(PHONON_LIBRARY_DIR/ s|\''${rootDir}/||" \
|
||||
-e "/^set(PHONON_BUILDSYSTEM_DIR/ s|\''${rootDir}|''${!outputDev}|"
|
||||
|
||||
sed -i cmake/FindPhononInternal.cmake \
|
||||
-e "/set(INCLUDE_INSTALL_DIR/ c set(INCLUDE_INSTALL_DIR \"''${!outputDev}/include\")"
|
||||
|
||||
${optionalString withQt5 ''
|
||||
sed -i cmake/FindPhononInternal.cmake \
|
||||
-e "/set(PLUGIN_INSTALL_DIR/ c set(PLUGIN_INSTALL_DIR \"$qtPluginPrefix/..\")"
|
||||
''}
|
||||
|
||||
sed -i CMakeLists.txt \
|
||||
-e "/set(BUILDSYSTEM_INSTALL_DIR/ c set(BUILDSYSTEM_INSTALL_DIR \"''${!outputDev}/${buildsystemdir}\")"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
sed -i "''${!outputDev}/lib/pkgconfig/${soname}.pc" \
|
||||
-e "/^exec_prefix=/ c exec_prefix=''${!outputBin}/bin"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -109,4 +109,30 @@ in rec {
|
||||
'';
|
||||
});
|
||||
|
||||
v_2_4_0 = pgDerivationBaseNewer.merge ( fix : {
|
||||
version = "2.4.0";
|
||||
sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29";
|
||||
sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
|
||||
builtInputs = [gdal json_c pkgconfig];
|
||||
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib";
|
||||
|
||||
dontDisableStatic = true;
|
||||
preConfigure = ''
|
||||
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
|
||||
configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
|
||||
'';
|
||||
postConfigure = ''
|
||||
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;
|
||||
s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/loader/Makefile";
|
||||
sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/scripts/python/Makefile";
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -183,10 +183,38 @@ stdenv.mkDerivation rec {
|
||||
sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
installPhase = optionalString stdenv.isDarwin ''
|
||||
runHook preInstall
|
||||
cp -r lib $out
|
||||
|
||||
mkdir -p $out/Applications
|
||||
mv bin/*.app $out/Applications
|
||||
rm -rf bin/*.app
|
||||
|
||||
cp -r bin $out
|
||||
|
||||
mkdir -p $out/share/doc/${name}
|
||||
mkdir -p $out/lib
|
||||
mkdir -p $out/lib/qt4/plugins
|
||||
mkdir -p $out/lib/qt4/imports
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/include
|
||||
mkdir -p $out/share/${name}
|
||||
|
||||
cp -r mkspecs $out/share/${name}
|
||||
cp -r translations $out/share/${name}
|
||||
cp -r tools/linguist/phrasebooks $out/share/${name}
|
||||
cp tools/porting/src/q3porting.xml $out/share/${name}
|
||||
|
||||
cp -r plugins $out/lib/qt4
|
||||
cp -r imports $out/lib/qt4
|
||||
cp -r doc/* $out/share/doc/${name}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = optionalString (!stdenv.isDarwin) ''
|
||||
rm -rf $out/tests
|
||||
'';
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
# I've not tried any case other than i686-pc-mingw32.
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
From: Konstantin Tokarev <annulen@yandex.ru>
|
||||
Date: Thu, 4 May 2017 12:12:37 +0000 (+0300)
|
||||
Subject: Fix compilation with ICU 59
|
||||
X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=bf172ae289a1348842005a9421797970f9b72060;hp=821eaaadc9d63d03aca65cf757230b520daaaa7c
|
||||
|
||||
Fix compilation with ICU 59
|
||||
|
||||
Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
|
||||
|
||||
Task-number: QTBUG-60532
|
||||
Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
---
|
||||
|
||||
diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
|
||||
index 812f3d4..77a3fd0 100644
|
||||
--- a/Source/JavaScriptCore/API/JSStringRef.cpp
|
||||
+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
|
||||
@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
|
||||
JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
|
||||
{
|
||||
initializeThreading();
|
||||
- return OpaqueJSString::create(chars, numChars).leakRef();
|
||||
+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
|
||||
}
|
||||
|
||||
JSStringRef JSStringCreateWithUTF8CString(const char* string)
|
||||
@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
|
||||
JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
|
||||
{
|
||||
initializeThreading();
|
||||
- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
|
||||
+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
|
||||
}
|
||||
|
||||
JSStringRef JSStringRetain(JSStringRef string)
|
||||
@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
|
||||
|
||||
const JSChar* JSStringGetCharactersPtr(JSStringRef string)
|
||||
{
|
||||
- return string->characters();
|
||||
+ return reinterpret_cast<const JSChar*>(string->characters());
|
||||
}
|
||||
|
||||
size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
|
||||
diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
|
||||
index 0b57f01..05e2733 100644
|
||||
--- a/Source/JavaScriptCore/runtime/DateConversion.cpp
|
||||
+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
|
||||
@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
|
||||
#if OS(WINDOWS)
|
||||
TIME_ZONE_INFORMATION timeZoneInformation;
|
||||
GetTimeZoneInformation(&timeZoneInformation);
|
||||
- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
|
||||
+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
|
||||
+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
|
||||
#else
|
||||
struct tm gtm = t;
|
||||
char timeZoneName[70];
|
||||
diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
|
||||
index 9df2c95..f5d6121 100644
|
||||
--- a/Source/WTF/wtf/TypeTraits.h
|
||||
+++ b/Source/WTF/wtf/TypeTraits.h
|
||||
@@ -72,6 +72,9 @@ namespace WTF {
|
||||
template<> struct IsInteger<unsigned long> { static const bool value = true; };
|
||||
template<> struct IsInteger<long long> { static const bool value = true; };
|
||||
template<> struct IsInteger<unsigned long long> { static const bool value = true; };
|
||||
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
|
||||
+ template<> struct IsInteger<char16_t> { static const bool value = true; };
|
||||
+#endif
|
||||
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
|
||||
template<> struct IsInteger<wchar_t> { static const bool value = true; };
|
||||
#endif
|
||||
diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
|
||||
index cbac67d..23400a6 100644
|
||||
--- a/Source/WebKit2/Shared/API/c/WKString.cpp
|
||||
+++ b/Source/WebKit2/Shared/API/c/WKString.cpp
|
||||
@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
|
||||
size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
|
||||
{
|
||||
COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
|
||||
- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
|
||||
+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
|
||||
}
|
||||
|
||||
size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
|
||||
@@ -1,3 +1,4 @@
|
||||
qtwebkit-dlopen-gtk.patch
|
||||
qtwebkit-dlopen-udev.patch
|
||||
qtwebkit-icucore-darwin.patch
|
||||
qtwebkit-icu-59.patch
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \
|
||||
WGET_ARGS=( https://download.qt.io/archive/qt/5.9/5.9.2/submodules/ \
|
||||
-A '*.tar.xz' )
|
||||
|
||||
3
pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series
Normal file
3
pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series
Normal file
@@ -0,0 +1,3 @@
|
||||
mkspecs-common-mac.patch
|
||||
mkspecs-features-mac.patch
|
||||
darwin-cf.patch
|
||||
@@ -3,7 +3,7 @@
|
||||
src, version, qtCompatVersion,
|
||||
|
||||
coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
|
||||
ruby,
|
||||
ruby, which,
|
||||
# darwin support
|
||||
darwin, libiconv, libcxx,
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
|
||||
libjpeg libpng libtiff
|
||||
]
|
||||
|
||||
++ lib.optional mesaSupported mesa
|
||||
++ lib.optional (mesaSupported && !stdenv.isDarwin) mesa
|
||||
|
||||
++ lib.optionals (!stdenv.isDarwin) [
|
||||
dbus glib udev
|
||||
@@ -73,14 +73,14 @@ stdenv.mkDerivation {
|
||||
++ lib.optional (postgresql != null) postgresql;
|
||||
|
||||
nativeBuildInputs =
|
||||
[ bison flex gperf lndir perl pkgconfig python2 ]
|
||||
[ bison flex gperf lndir perl pkgconfig python2 which ]
|
||||
++ lib.optional (!stdenv.isDarwin) patchelf;
|
||||
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
||||
patches =
|
||||
copyPathsToStore (lib.readPathsFromFile ./. ./series)
|
||||
++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch;
|
||||
++ stdenv.lib.optional stdenv.isDarwin (copyPathsToStore (lib.readPathsFromFile ./. ./darwin-series));
|
||||
|
||||
postPatch =
|
||||
''
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
|
||||
sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
''
|
||||
|
||||
+ lib.optionalString mesaSupported ''
|
||||
+ lib.optionalString (mesaSupported && !stdenv.isDarwin) ''
|
||||
sed -i mkspecs/common/linux.conf \
|
||||
-e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \
|
||||
-e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|"
|
||||
@@ -110,10 +110,10 @@ stdenv.mkDerivation {
|
||||
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
|
||||
-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 '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
|
||||
substituteInPlace ./mkspecs/common/mac.conf \
|
||||
--replace "/System/Library/Frameworks/OpenGL.framework/" "${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework/"
|
||||
substituteInPlace ./mkspecs/common/mac.conf \
|
||||
--replace "/System/Library/Frameworks/AGL.framework/" "${darwin.apple_sdk.frameworks.AGL}/Library/Frameworks/AGL.framework/"
|
||||
'';
|
||||
# Note on the above: \x27 is a way if including a single-quote
|
||||
# character in the sed string arguments.
|
||||
@@ -144,7 +144,7 @@ stdenv.mkDerivation {
|
||||
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
|
||||
]
|
||||
|
||||
++ lib.optional mesaSupported
|
||||
++ lib.optional (mesaSupported && !stdenv.isDarwin)
|
||||
''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
|
||||
|
||||
++ lib.optionals (!stdenv.isDarwin)
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- qtbase-opensource-src-5.9.1.orig/mkspecs/common/mac.conf 2017-09-16 16:40:30.000000000 +0800
|
||||
+++ qtbase-opensource-src-5.9.1/mkspecs/common/mac.conf 2017-09-16 16:41:27.000000000 +0800
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
QMAKE_FIX_RPATH = install_name_tool -id
|
||||
|
||||
-QMAKE_LFLAGS_RPATH = -Wl,-rpath,
|
||||
+QMAKE_LFLAGS_RPATH =
|
||||
QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
|
||||
|
||||
QMAKE_LFLAGS_REL_RPATH =
|
||||
@@ -0,0 +1,278 @@
|
||||
diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf
|
||||
--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf 2017-09-16 16:40:30.000000000 +0800
|
||||
+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf 2017-09-16 16:41:03.000000000 +0800
|
||||
@@ -24,165 +24,3 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
-
|
||||
-# Add the same default rpaths as Xcode does for new projects.
|
||||
-# This is especially important for iOS/tvOS/watchOS where no other option is possible.
|
||||
-!no_default_rpath {
|
||||
- QMAKE_RPATHDIR += @executable_path/Frameworks
|
||||
- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
|
||||
-}
|
||||
-
|
||||
-# Don't pass -headerpad_max_install_names when using Bitcode.
|
||||
-# In that case the linker emits a warning stating that the flag is ignored when
|
||||
-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962).
|
||||
-# Using this flag is also unnecessary in practice on UIKit platforms since they
|
||||
-# are sandboxed, and only UIKit platforms support bitcode to begin with.
|
||||
-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD
|
||||
-
|
||||
-app_extension_api_only {
|
||||
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
-}
|
||||
-
|
||||
-macx-xcode {
|
||||
- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
|
||||
- debug_information_format.name = DEBUG_INFORMATION_FORMAT
|
||||
- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT
|
||||
- debug_information_format.build = debug
|
||||
- QMAKE_MAC_XCODE_SETTINGS += debug_information_format
|
||||
- }
|
||||
-
|
||||
- QMAKE_XCODE_ARCHS =
|
||||
-
|
||||
- arch_device.name = "ARCHS[sdk=$${device.sdk}*]"
|
||||
- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_MAC_XCODE_SETTINGS += arch_device
|
||||
-
|
||||
- simulator {
|
||||
- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"
|
||||
- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS
|
||||
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS
|
||||
- QMAKE_MAC_XCODE_SETTINGS += arch_simulator
|
||||
- }
|
||||
-
|
||||
- only_active_arch.name = ONLY_ACTIVE_ARCH
|
||||
- only_active_arch.value = YES
|
||||
- only_active_arch.build = debug
|
||||
- QMAKE_MAC_XCODE_SETTINGS += only_active_arch
|
||||
-} else {
|
||||
- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
|
||||
- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
|
||||
-
|
||||
- isEmpty(VALID_ARCHS): \
|
||||
- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
|
||||
-
|
||||
- single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
|
||||
-
|
||||
- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
|
||||
- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))
|
||||
-
|
||||
- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS
|
||||
-
|
||||
- arch_flags = $(EXPORT_ARCH_ARGS)
|
||||
-
|
||||
- QMAKE_CFLAGS += $$arch_flags
|
||||
- QMAKE_CXXFLAGS += $$arch_flags
|
||||
- QMAKE_LFLAGS += $$arch_flags
|
||||
-
|
||||
- QMAKE_PCH_ARCHS = $$VALID_ARCHS
|
||||
-
|
||||
- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET
|
||||
- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
|
||||
- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET
|
||||
- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET
|
||||
-
|
||||
- # If we're doing a simulator and device build, device and simulator
|
||||
- # architectures use different paths and flags for the sysroot and
|
||||
- # deployment target switch, so we must multiplex them across multiple
|
||||
- # architectures using -Xarch. Otherwise we fall back to the simple path.
|
||||
- # This is not strictly necessary, but results in cleaner command lines
|
||||
- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit
|
||||
- # individual rules to a different set of architecture(s) from the overall
|
||||
- # build (such as machtest in QtCore).
|
||||
- simulator:device {
|
||||
- QMAKE_XARCH_CFLAGS =
|
||||
- QMAKE_XARCH_LFLAGS =
|
||||
- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS
|
||||
-
|
||||
- for (arch, VALID_ARCHS) {
|
||||
- contains(VALID_SIMULATOR_ARCHS, $$arch) {
|
||||
- sdk = $$simulator.sdk
|
||||
- version_identifier = $$simulator.deployment_identifier
|
||||
- } else {
|
||||
- sdk = $$device.sdk
|
||||
- version_identifier = $$device.deployment_identifier
|
||||
- }
|
||||
-
|
||||
- version_min_flags = \
|
||||
- -Xarch_$${arch} \
|
||||
- -m$${version_identifier}-version-min=$$deployment_target
|
||||
- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \
|
||||
- -Xarch_$${arch} \
|
||||
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
|
||||
- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
|
||||
- -Xarch_$${arch} \
|
||||
- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)
|
||||
-
|
||||
- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
|
||||
- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
|
||||
-
|
||||
- QMAKE_EXTRA_VARIABLES += \
|
||||
- QMAKE_XARCH_CFLAGS_$${arch} \
|
||||
- QMAKE_XARCH_LFLAGS_$${arch}
|
||||
- }
|
||||
-
|
||||
- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
|
||||
- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
|
||||
- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS)
|
||||
- } else {
|
||||
- simulator: \
|
||||
- version_identifier = $$simulator.deployment_identifier
|
||||
- else: \
|
||||
- version_identifier = $$device.deployment_identifier
|
||||
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
|
||||
- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- }
|
||||
-
|
||||
- # Enable precompiled headers for multiple architectures
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE =
|
||||
- for (arch, VALID_ARCHS) {
|
||||
- icc_pch_style: \
|
||||
- use_flag = "-pch-use "
|
||||
- else: \
|
||||
- use_flag = -include
|
||||
-
|
||||
- # Only use Xarch with multi-arch, as the option confuses ccache
|
||||
- count(VALID_ARCHS, 1, greaterThan): \
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE += \
|
||||
- -Xarch_$${arch}
|
||||
-
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE += \
|
||||
- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}}
|
||||
- }
|
||||
- icc_pch_style {
|
||||
- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT}
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE =
|
||||
- } else {
|
||||
- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
||||
- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
||||
- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
||||
- }
|
||||
-
|
||||
- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}
|
||||
-}
|
||||
-
|
||||
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
|
||||
-cache(QMAKE_XCODE_VERSION, stash)
|
||||
-
|
||||
-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
|
||||
diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf
|
||||
--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:30.000000000 +0800
|
||||
+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:45.000000000 +0800
|
||||
@@ -1,51 +1,2 @@
|
||||
CONFIG = asset_catalogs rez $$CONFIG
|
||||
load(default_pre)
|
||||
-
|
||||
-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
|
||||
- # Get path of Xcode's Developer directory
|
||||
- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
|
||||
- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \
|
||||
- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.")
|
||||
-
|
||||
- # Make sure Xcode path is valid
|
||||
- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \
|
||||
- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
|
||||
-
|
||||
- # Make sure Xcode is set up properly
|
||||
- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
|
||||
- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
|
||||
-}
|
||||
-
|
||||
-isEmpty(QMAKE_XCODE_VERSION) {
|
||||
- # Extract Xcode version using xcodebuild
|
||||
- xcode_version = $$system("/usr/bin/xcodebuild -version")
|
||||
- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
|
||||
- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
|
||||
- unset(xcode_version)
|
||||
-}
|
||||
-
|
||||
-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
|
||||
- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist
|
||||
- exists($$QMAKE_XCODE_PREFERENCES_FILE): \
|
||||
- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null")
|
||||
-
|
||||
- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \
|
||||
- cache(QMAKE_TARGET_BUNDLE_PREFIX)
|
||||
-}
|
||||
-
|
||||
-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon
|
||||
-
|
||||
-# Make the default debug info format for static debug builds
|
||||
-# DWARF instead of DWARF with dSYM. This cuts down build times
|
||||
-# for application debug builds significantly, as Xcode doesn't
|
||||
-# have to pull out all the DWARF info from the Qt static libs
|
||||
-# and put it into a dSYM file. We don't need that dSYM file in
|
||||
-# the first place, since the information is available in the
|
||||
-# object files inside the archives (static libraries).
|
||||
-macx-xcode:qtConfig(static): \
|
||||
- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf
|
||||
-
|
||||
-# This variable is used by the xcode_dynamic_library_suffix
|
||||
-# feature, which allows Xcode to choose the Qt libraries to link to
|
||||
-# at build time, depending on the current Xcode SDK and configuration.
|
||||
-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
|
||||
diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf
|
||||
--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf 2017-09-16 16:40:30.000000000 +0800
|
||||
+++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf 2017-09-16 16:41:16.000000000 +0800
|
||||
@@ -1,49 +0,0 @@
|
||||
-
|
||||
-isEmpty(QMAKE_MAC_SDK): \
|
||||
- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
|
||||
-
|
||||
-contains(QMAKE_MAC_SDK, .*/.*): \
|
||||
- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")
|
||||
-
|
||||
-defineReplace(xcodeSDKInfo) {
|
||||
- info = $$1
|
||||
- sdk = $$2
|
||||
- isEmpty(sdk): \
|
||||
- sdk = $$QMAKE_MAC_SDK
|
||||
-
|
||||
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
|
||||
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null")
|
||||
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'")
|
||||
- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
|
||||
- }
|
||||
-
|
||||
- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info}))
|
||||
-}
|
||||
-
|
||||
-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)
|
||||
-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
|
||||
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
|
||||
-
|
||||
-sysrootified =
|
||||
-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
|
||||
-QMAKE_INCDIR_OPENGL = $$sysrootified
|
||||
-
|
||||
-QMAKESPEC_NAME = $$basename(QMAKESPEC)
|
||||
-
|
||||
-# Resolve SDK version of various tools
|
||||
-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) {
|
||||
- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
|
||||
- !isEmpty($$tool_variable) {
|
||||
- $$tool = $$eval($$tool_variable)
|
||||
- next()
|
||||
- }
|
||||
-
|
||||
- value = $$eval($$tool)
|
||||
- isEmpty(value): next()
|
||||
-
|
||||
- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null")
|
||||
- isEmpty(sysrooted): next()
|
||||
-
|
||||
- $$tool = $$sysrooted $$member(value, 1, -1)
|
||||
- cache($$tool_variable, set stash, $$tool)
|
||||
-}
|
||||
Common subdirectories: qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/unsupported and qtbase-opensource-src-5.9.1/mkspecs/features/mac/unsupported
|
||||
@@ -3,275 +3,283 @@
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg";
|
||||
name = "qt3d-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qt3d-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "10q7npsl087sja0g2n3v0cg4n75y7sbrs3mfjcsg1wpkw8psjmf9";
|
||||
name = "qt3d-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg";
|
||||
name = "qtactiveqt-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtactiveqt-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1kz59ns6afnd8s73ys7hqffg9ki9g7px009b2ab72nq7f8cqsib0";
|
||||
name = "qtactiveqt-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtandroidextras = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj";
|
||||
name = "qtandroidextras-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtandroidextras-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1hsx16v17iqjhs20xn7an2ad7g8djwrmxachscjhji1dvk4682nl";
|
||||
name = "qtandroidextras-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw";
|
||||
name = "qtbase-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "16v0dny4rcyd5p8qsnsfg89w98k8kqk3rp9x3g3k7xjmi53bpqkz";
|
||||
name = "qtbase-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcanvas3d = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb";
|
||||
name = "qtcanvas3d-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcanvas3d-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1siyzgm1mjx90rwyzzq9vw2s2xzyf6n7q0vn8gw7mdim5indda44";
|
||||
name = "qtcanvas3d-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k";
|
||||
name = "qtcharts-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcharts-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "193a3imkgryw42s0gbwaj9gpqd673h3jrg86jvmy33l2fc5gfyjf";
|
||||
name = "qtcharts-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0";
|
||||
name = "qtconnectivity-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtconnectivity-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1k7kjmlny0ykm40qx796wbsg3310v6b8hqizkbr597cmxjbrax9c";
|
||||
name = "qtconnectivity-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13";
|
||||
name = "qtdatavis3d-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdatavis3d-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1cmjjbbmdqdix1f8b7qyc2vwhj9pvchc8r4lp65qw11dhycmdbh6";
|
||||
name = "qtdatavis3d-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj";
|
||||
name = "qtdeclarative-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "020bha6q8byxc8cj5zw7gms5rgsjg71hv31hv1rr2fy7x56zsh0d";
|
||||
name = "qtdeclarative-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x";
|
||||
name = "qtdoc-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdoc-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0dfva8h8f9wpszih285qcxlfcijy52qcbfy1zy20gxh72nfi86c9";
|
||||
name = "qtdoc-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgamepad = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi";
|
||||
name = "qtgamepad-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgamepad-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0lm5v43psf7r8zc79dcjdmmdnz4jm30ylgkvsyv8k88mj06yklbn";
|
||||
name = "qtgamepad-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgraphicaleffects = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz";
|
||||
name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgraphicaleffects-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0xpvigfiqfqvf05ywj8x69y57rp8dwq2hs1kpxlxs15pniz4wn8l";
|
||||
name = "qtgraphicaleffects-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr";
|
||||
name = "qtimageformats-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtimageformats-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1wwxxcl24mk1p4w6knyfai09axmwqsm6cgsbkjsmdz3zmjh6qqis";
|
||||
name = "qtimageformats-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b";
|
||||
name = "qtlocation-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "033b6l6jbvmc0k5qvbgh5vkzvfga7npqcphrywrrqkmx9vj446n8";
|
||||
name = "qtlocation-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmacextras = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11";
|
||||
name = "qtmacextras-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmacextras-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0f14xkardmidvwljccrv6adcs4nyn8rzry9k74mwqn0ikvycs3my";
|
||||
name = "qtmacextras-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4";
|
||||
name = "qtmultimedia-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0815hi3cxy5zy6yc5fkdpx2xd6rk7968j1ziwl2g4wa80802g9n9";
|
||||
name = "qtmultimedia-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra";
|
||||
name = "qtnetworkauth-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtnetworkauth-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "16i33m8x5yii22ciq97bpfmnw0lwhvgv84i2az30a1ikm9dg00x0";
|
||||
name = "qtnetworkauth-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpurchasing = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss";
|
||||
name = "qtpurchasing-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtpurchasing-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "04f28y7qcr4kd0pw26mm515qj7haxr0i8lijn1q47wkikxyhawca";
|
||||
name = "qtpurchasing-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj";
|
||||
name = "qtquickcontrols-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "07xxhkfsljwdwlp9jfp88pwkrig02y2pnwhdsaz8mkcackwfq2az";
|
||||
name = "qtquickcontrols-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols2 = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0";
|
||||
name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols2-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1ln83afxyp5dmvdnq6n7as82xrd5k3xvfx7b1jxnljivslyxsm9b";
|
||||
name = "qtquickcontrols2-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0";
|
||||
name = "qtremoteobjects-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtremoteobjects-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1ylphdwis34y4pm9xiwh2xqfd0hh2gp8kkawlps2q5mh2bm11376";
|
||||
name = "qtremoteobjects-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscript = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp";
|
||||
name = "qtscript-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscript-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1wa0rnbphkhgydnwkf5bjwn0llskl6hgs0964nh0jik8qaspv027";
|
||||
name = "qtscript-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0";
|
||||
name = "qtscxml-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscxml-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0pdimqwdrj8hckm81lwy1z58ji4bdv0bzgv336m0a8v3pj914awx";
|
||||
name = "qtscxml-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was";
|
||||
name = "qtsensors-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsensors-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1lxmhi19dbb8vjhpjph0l0ss6zh72hb4908lp4s1pgf8r641ai3r";
|
||||
name = "qtsensors-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa";
|
||||
name = "qtserialbus-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialbus-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "025yv7zajz5scrmkjkmgkyvxpgkliqvrzc88is0gr481zpd4phmv";
|
||||
name = "qtserialbus-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1";
|
||||
name = "qtserialport-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialport-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0hndc9z7qzxazzjvc6k5yd58afw13444plk70b05nqdi5p19rvah";
|
||||
name = "qtserialport-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c";
|
||||
name = "qtspeech-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtspeech-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0cq33dffi7q7dnvzhdivky5prakb8xnwap0b76fwgirhbbn88ypg";
|
||||
name = "qtspeech-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr";
|
||||
name = "qtsvg-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsvg-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "020icrl9vi8jh8ygsssqrx2bl8bx28m15dwmf9a969qdnvxyp5ms";
|
||||
name = "qtsvg-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4";
|
||||
name = "qttools-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "06nqsa5mj0mc9w9xbm7mgdkb66x4wlvkhnas32f97sb8ic8rdf9b";
|
||||
name = "qttools-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja";
|
||||
name = "qttranslations-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttranslations-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0byi4s07lfnzzlr2c4sc5qg3hrysswmakwmf80q2mx50kpgnvwax";
|
||||
name = "qttranslations-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b";
|
||||
name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtvirtualkeyboard-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1z66chp5746cb0rwy2isnpbvwjj44qvp2hg56n3g47dj901wldp8";
|
||||
name = "qtvirtualkeyboard-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g";
|
||||
name = "qtwayland-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwayland-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1ipn4xh0dj1kjg5i4vfl4gpx3hg2377w5gls47xpv1ikz41lshzn";
|
||||
name = "qtwayland-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0";
|
||||
name = "qtwebchannel-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebchannel-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "09iss70c1iqgf8qpik35qlgrdw5y9935v0fm2ppgkmxdxkpls6ww";
|
||||
name = "qtwebchannel-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn";
|
||||
name = "qtwebengine-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0251qk04yif4lsn8qvkc2kmzzmaw1v3pfh5ypr06d04zb3j6kc6a";
|
||||
name = "qtwebengine-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebsockets-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0x0nx1ampqsgj9qlc3l32z3ham1a5vq7m2lnxk5pr92yj6yw3pdg";
|
||||
name = "qtwebsockets-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebkit = {
|
||||
@@ -290,44 +298,36 @@
|
||||
name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "5.9.1";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1";
|
||||
name = "qtwebsockets-opensource-src-5.9.1.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn";
|
||||
name = "qtwebview-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebview-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1cdqw6pjfqagnwxrha0s18zadjnm65dsildxj07h2qiwqxwyrjpw";
|
||||
name = "qtwebview-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwinextras = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s";
|
||||
name = "qtwinextras-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwinextras-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "07qq9rxl6hhl300w7qxsjjbdd5fwpszfk3rbinxklg20f6c6ixml";
|
||||
name = "qtwinextras-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtx11extras = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6";
|
||||
name = "qtx11extras-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtx11extras-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "1ias745j5lfnrfkgyk0pr8n8zlkqs08gq7yyzaj1c645sh54b1fv";
|
||||
name = "qtx11extras-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtxmlpatterns = {
|
||||
version = "5.9.1";
|
||||
version = "5.9.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz";
|
||||
sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m";
|
||||
name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz";
|
||||
url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtxmlpatterns-opensource-src-5.9.2.tar.xz";
|
||||
sha256 = "0knk4bplqhvsxar1wv16bzfw57q0aja12gdaxz7m8mvx121sm9ha";
|
||||
name = "qtxmlpatterns-opensource-src-5.9.2.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,6 +2,12 @@ qtPluginPrefix=@qtPluginPrefix@
|
||||
qtQmlPrefix=@qtQmlPrefix@
|
||||
qtDocPrefix=@qtDocPrefix@
|
||||
|
||||
_qtRmCMakeLink() {
|
||||
find "${!outputLib}" -name "*.cmake" -type l | xargs rm
|
||||
}
|
||||
|
||||
postInstallHooks+=(_qtRmCMakeLink)
|
||||
|
||||
addToSearchPathOnceWithCustomDelimiter() {
|
||||
local delim="$1"
|
||||
local search="$2"
|
||||
|
||||
@@ -1,22 +1,32 @@
|
||||
{ stdenv, fetchurl, zlib, bzip2, lzma, curl }:
|
||||
{ stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "${major}.0";
|
||||
pname = "htslib";
|
||||
major = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2";
|
||||
sha256 = "0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0";
|
||||
url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
|
||||
sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m";
|
||||
};
|
||||
|
||||
# perl is only used during the check phase.
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
buildInputs = [ zlib bzip2 lzma curl ];
|
||||
|
||||
configureFlags = "--enable-libcurl"; # optional but strongly recommended
|
||||
|
||||
installFlags = "prefix=$(out)";
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs test/
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A C library for reading/writing high-throughput sequencing data";
|
||||
license = licenses.mit;
|
||||
@@ -25,4 +35,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ maintainers.mimadrid ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spdlog-${version}";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabime";
|
||||
repo = "spdlog";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza";
|
||||
owner = "gabime";
|
||||
repo = "spdlog";
|
||||
rev = "v${version}";
|
||||
sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
|
||||
|
||||
@@ -28,8 +28,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ obadz ];
|
||||
platforms = platforms.all;
|
||||
|
||||
# This is a header-only library, no point in hydra building it:
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = http://www.twolame.org/;
|
||||
license = with licenses; [ lgpl2Plus ];
|
||||
platforms = with platforms; [ unix ];
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "3.24.10";
|
||||
sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75";
|
||||
})
|
||||
171
pkgs/development/libraries/v8/6_x.nix
Normal file
171
pkgs/development/libraries/v8/6_x.nix
Normal file
@@ -0,0 +1,171 @@
|
||||
{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
|
||||
, doCheck ? false
|
||||
, snapshot ? true
|
||||
}:
|
||||
|
||||
let
|
||||
arch = if stdenv.isArm
|
||||
then if stdenv.is64bit
|
||||
then"arm64"
|
||||
else "arm"
|
||||
else if stdenv.is64bit
|
||||
then"x64"
|
||||
else "ia32";
|
||||
git_url = "https://chromium.googlesource.com";
|
||||
|
||||
deps = {
|
||||
"base/trace_event/common" = fetchgit {
|
||||
url = "${git_url}/chromium/src/base/trace_event/common.git";
|
||||
rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9";
|
||||
sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p";
|
||||
};
|
||||
"build" = fetchgit {
|
||||
url = "${git_url}/chromium/src/build.git";
|
||||
rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367";
|
||||
sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k";
|
||||
};
|
||||
"buildtools" = fetchgit {
|
||||
url = "${git_url}/chromium/buildtools.git";
|
||||
rev = "5af0a3a8b89827a8634132080a39ab4b63dee489";
|
||||
sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1";
|
||||
};
|
||||
"test/benchmarks/data" = fetchgit {
|
||||
url = "${git_url}/v8/deps/third_party/benchmarks.git";
|
||||
rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
|
||||
sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
|
||||
};
|
||||
"test/mozilla/data" = fetchgit {
|
||||
url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
|
||||
rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
|
||||
sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
|
||||
};
|
||||
"test/test262/data" = fetchgit {
|
||||
url = "${git_url}/external/github.com/tc39/test262.git";
|
||||
rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91";
|
||||
sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4";
|
||||
};
|
||||
"test/test262/harness" = fetchgit {
|
||||
url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
|
||||
rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
|
||||
sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
|
||||
};
|
||||
"test/wasm-js" = fetchgit {
|
||||
url = "${git_url}/external/github.com/WebAssembly/spec.git";
|
||||
rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c";
|
||||
sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr";
|
||||
};
|
||||
"testing/gmock" = fetchgit {
|
||||
url = "${git_url}/external/googlemock.git";
|
||||
rev = "0421b6f358139f02e102c9c332ce19a33faf75be";
|
||||
sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp";
|
||||
};
|
||||
"testing/gtest" = fetchgit {
|
||||
url = "${git_url}/external/github.com/google/googletest.git";
|
||||
rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
|
||||
sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
|
||||
};
|
||||
"third_party/icu" = fetchgit {
|
||||
url = "${git_url}/chromium/deps/icu.git";
|
||||
rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6";
|
||||
sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b";
|
||||
};
|
||||
"third_party/instrumented_libraries" = fetchgit {
|
||||
url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
|
||||
rev = "644afd349826cb68204226a16c38bde13abe9c3c";
|
||||
sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa";
|
||||
};
|
||||
# templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template)
|
||||
"third_party/jinja2" = fetchgit {
|
||||
url = "${git_url}/chromium/src/third_party/jinja2.git";
|
||||
rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
|
||||
sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
|
||||
};
|
||||
"third_party/markupsafe" = fetchgit {
|
||||
url = "${git_url}/chromium/src/third_party/markupsafe.git";
|
||||
rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
|
||||
sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
|
||||
};
|
||||
"tools/clang" = fetchgit {
|
||||
url = "${git_url}/chromium/src/tools/clang.git";
|
||||
rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe";
|
||||
sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf";
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "v8-${version}";
|
||||
version = "6.2.414.27";
|
||||
|
||||
inherit doCheck;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v8";
|
||||
repo = "v8";
|
||||
rev = version;
|
||||
sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
${lib.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList (n: v: ''
|
||||
mkdir -p $sourceRoot/${n}
|
||||
cp -r ${v}/* $sourceRoot/${n}
|
||||
'') deps)}
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
# use our gn, not the bundled one
|
||||
sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py
|
||||
|
||||
# disable tests
|
||||
if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi
|
||||
|
||||
# disable sysroot usage
|
||||
chmod u+w build/config build/config/sysroot.gni
|
||||
sed -i build/config/sysroot.gni \
|
||||
-e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }'
|
||||
|
||||
# patch shebangs (/usr/bin/env)
|
||||
patchShebangs tools/dev/v8gen.py
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
tools/dev/v8gen.py -vv ${arch}.release -- \
|
||||
is_component_build=true \
|
||||
${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \
|
||||
is_clang=false \
|
||||
linux_use_bundled_binutils=false \
|
||||
treat_warnings_as_errors=false
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ gn ninja pkgconfig ];
|
||||
buildInputs = [ python glib ];
|
||||
|
||||
buildPhase = ''
|
||||
ninja -C out.gn/${arch}.release/
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
install -vD out.gn/${arch}.release/d8 "$out/bin/d8"
|
||||
install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot"
|
||||
mkdir -p "$out/lib"
|
||||
for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do
|
||||
install -vD out.gn/${arch}.release/$f "$out/lib/$f"
|
||||
done
|
||||
install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat"
|
||||
mkdir -p "$out/include"
|
||||
cp -vr include/*.h "$out/include"
|
||||
cp -vr include/libplatform "$out/include"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google's open source JavaScript engine";
|
||||
maintainers = with maintainers; [ cstrahan proglodyte ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
{ stdenv, fetchurl, gyp, readline, python, which, icu
|
||||
, version
|
||||
, sha256
|
||||
, ...
|
||||
}:
|
||||
|
||||
assert readline != null;
|
||||
|
||||
let
|
||||
arch = if stdenv.is64bit then "x64" else "ia32";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "v8-${version}";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
|
||||
+ "${name}.tar.bz2";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
|
||||
PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \
|
||||
build/gyp_v8 \
|
||||
-f make \
|
||||
--generator-output="out" \
|
||||
-Dflock_index=0 \
|
||||
-Dv8_enable_i18n_support=1 \
|
||||
-Duse_system_icu=1 \
|
||||
-Dconsole=readline \
|
||||
-Dcomponent=shared_library \
|
||||
-Dv8_target_arch=${arch}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
buildInputs = [ readline python icu ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
|
||||
|
||||
buildFlags = [
|
||||
"LINK=g++"
|
||||
"-C out"
|
||||
"builddir=$(CURDIR)/Release"
|
||||
"BUILDTYPE=Release"
|
||||
];
|
||||
|
||||
postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) ''
|
||||
sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
install -vD out/Release/d8 "$out/bin/d8"
|
||||
${if stdenv.system == "x86_64-darwin" then ''
|
||||
install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
|
||||
'' else ''
|
||||
install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
|
||||
''}
|
||||
cp -vr include "$out/"
|
||||
'';
|
||||
|
||||
postFixup = if stdenv.isDarwin then ''
|
||||
install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
|
||||
install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
|
||||
'' else null;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Google's open source JavaScript engine";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
47
pkgs/development/libraries/v8/update.sh
Executable file
47
pkgs/development/libraries/v8/update.sh
Executable file
@@ -0,0 +1,47 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl -p nix-prefetch-git
|
||||
VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux
|
||||
TARGET_CHANNEL=beta
|
||||
FILE_PATH=6_x.nix
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }")
|
||||
|
||||
echo "Using V8 version --> $v8_version"
|
||||
sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${FILE_PATH}
|
||||
|
||||
sha256=$(nix-prefetch-git --no-deepClone https://github.com/v8/v8.git "refs/tags/${v8_version}" \
|
||||
| sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')
|
||||
sed -e "/repo = \"v8\"/ { n;n; s#\".*\"#\"${sha256}\"# }" -i ${FILE_PATH}
|
||||
|
||||
deps="$(mktemp)"
|
||||
|
||||
curl -s -o "$deps" "https://raw.githubusercontent.com/v8/v8/${v8_version}/DEPS"
|
||||
echo $deps
|
||||
|
||||
sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read dep; do
|
||||
echo "Processing dependency --> $dep"
|
||||
escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g')
|
||||
dep_rev=$(sed -ne "/\"v8\/${escaped_dep}\":/ { n; s#.*+ \"##; s#\".*##; p }" "$deps")
|
||||
|
||||
if [ "$dep_rev" = "" ]; then
|
||||
echo "Failed to resolve dependency $dep, not listed in DEPS file"
|
||||
rm -f "$deps"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${FILE_PATH})
|
||||
sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')
|
||||
|
||||
if [ "$sha256" = "" ]; then
|
||||
echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev"
|
||||
rm -f "$deps"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${FILE_PATH}
|
||||
done
|
||||
|
||||
rm -f "$deps"
|
||||
echo done.
|
||||
Reference in New Issue
Block a user