Merge master into staging-next
This commit is contained in:
@@ -21,13 +21,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "amdvlk";
|
||||
version = "2020.Q4.1";
|
||||
version = "2020.Q4.2";
|
||||
|
||||
src = fetchRepoProject {
|
||||
name = "${pname}-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${version}";
|
||||
sha256 = "UxUsXngsMbLNSmg0a7gqCqw30ckZ8IlDrSZMMnKHlh4=";
|
||||
sha256 = "qqP95+K8G9Z3Da1pUT9EGAUi83IM50qI9eZxpp7Vlqg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catch2";
|
||||
version = "2.12.3";
|
||||
version = "2.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v${version}";
|
||||
sha256="0rp30754frp88wbl17ksr40mmffw5xibq73blgx9jj42d7nl891x";
|
||||
sha256="100r0kmra8jmra2hv92lzvwcmphpaiccwvq3lpdsa5b7hailhach";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cutelyst";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cutelyst";
|
||||
repo = "cutelyst";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n";
|
||||
sha256 = "1xbw8ag3iwm69dhrsg54anrlzvvflj6pwsj42z6hrl0yckabn99z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
{ stdenv, fetchFromGitHub, python2Packages}:
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
buildPythonApplication rec {
|
||||
pname = "cxxtest";
|
||||
version = "4.4";
|
||||
in python2Packages.buildPythonApplication {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CxxTest";
|
||||
@@ -13,16 +11,26 @@ in python2Packages.buildPythonApplication {
|
||||
sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
sourceRoot=$(echo */python)
|
||||
sourceRoot = "source/python";
|
||||
|
||||
postCheck = ''
|
||||
python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h
|
||||
$CXX -I.. -o build/GoodSuite build/GoodSuite.cpp
|
||||
build/GoodSuite
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/include"
|
||||
cp -r ../cxxtest "$out/include"
|
||||
'';
|
||||
|
||||
dontWrapPythonPrograms = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://cxxtest.com";
|
||||
description = "Unit testing framework for C++";
|
||||
platforms = platforms.unix ;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl3;
|
||||
maintainers = [ maintainers.juliendehos ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enet-1.3.15";
|
||||
name = "enet-1.3.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://enet.bespin.org/download/${name}.tar.gz";
|
||||
sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas";
|
||||
sha256 = "1lggc82rbzscci057dqqyhkbq4j6mr5k01hbrvn06jkzc2xpxdxv";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gensio";
|
||||
version = "2.1.4";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = "${pname}";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc";
|
||||
sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.33.2"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
pname = "grpc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c";
|
||||
sha256 = "0cc7yfa37ngrr0q9k3lm2yi4i57bfsyxwbblwc0f801k6wvgavcy";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [
|
||||
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp libnsl ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
|
||||
++ stdenv.lib.optionals stdenv.isLinux [ libnsl ];
|
||||
|
||||
cmakeFlags =
|
||||
[ "-DgRPC_ZLIB_PROVIDER=package"
|
||||
|
||||
@@ -5,11 +5,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gsoap";
|
||||
version = "${majorVersion}.53";
|
||||
version = "${majorVersion}.108";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip";
|
||||
sha256 = "0n35dh32gidi65c36cwjd91304pwiabfblvd64kg21djpjl06qcr";
|
||||
sha256 = "0x58bwlclk7frv03kg8bp0pm7zl784samvbzskrnr7dl5v866nvl";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ];
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "20.2.5";
|
||||
version = "20.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0jg3kc74iqmbclx77a6dp4h85va8wi210x4zf5jypiq35c57r8hh";
|
||||
sha256 = "0727pr7sknqi859gb5z472kgbbwx40574iyls8fgirm7lcz6gbd9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
|
||||
, libXau, libXdmcp, libpthreadstubs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-sdk";
|
||||
version = "20.2.1";
|
||||
version = "20.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
|
||||
sha256 = "0m3ipfdknpgrdwiywlinl4sfkfrvyv7wmq1j83pmbr54z067sgg1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Intel-Media-SDK";
|
||||
repo = "MediaSDK";
|
||||
rev = "intel-mediasdk-${version}";
|
||||
sha256 = "13b698zp9b228x81yly0qx3zvj821niz3yad74b229i3z7rf8wzd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
32
pkgs/development/libraries/keystone/default.nix
Normal file
32
pkgs/development/libraries/keystone/default.nix
Normal file
@@ -0,0 +1,32 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keystone";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keystone-engine";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
python3
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight multi-platform, multi-architecture assembler framework";
|
||||
homepage = "https://www.keystone-engine.org";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -32,7 +32,7 @@ mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pulseaudio bindings for Qt";
|
||||
homepage = "KPeople VCard Support";
|
||||
homepage = "https://github.com/KDE/kpeoplevcard";
|
||||
license = with licenses; [ lgpl2 ];
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leatherman";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1mgd7jqfg6f0y2yrh2m1njlwrpd15kas88776jdd5fsl7gvb5khn";
|
||||
sha256 = "1iz8w0q4m7dqshjqfbwxwrasabs4j8jlil4w3kxdr3v9ldkl4v3d";
|
||||
rev = version;
|
||||
repo = "leatherman";
|
||||
owner = "puppetlabs";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libavif";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOMediaCodec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fs222cn1d60pv5fjsr92axk5dival70b6yqw0wng5ikk9zsdkhy";
|
||||
sha256 = "0f0l8ywz2jhc9mkfrzdxdvr3q39a404yn9wcyvqshfbkbprsan4p";
|
||||
};
|
||||
|
||||
# reco: encode libaom slowest but best, decode dav1d fastest
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfprint";
|
||||
version = "1.90.2";
|
||||
version = "1.90.3";
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "libfprint";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b";
|
||||
sha256 = "1fs0qrfrqnvc6kcsg81l5p89n8jnsx9dr1pzxpb8ghwas8c9v52i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgnurl";
|
||||
version = "7.70.0";
|
||||
version = "7.72.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
|
||||
sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa";
|
||||
sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgpiod";
|
||||
version = "1.5.2";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
|
||||
sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r";
|
||||
sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5";
|
||||
};
|
||||
|
||||
buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libhdhomerun";
|
||||
version = "20200521";
|
||||
version = "20200907";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz";
|
||||
sha256 = "0s0683bwyd10n3r2sanlyd07ii3fmi3vl9w9a2rwlpcclzq3h456";
|
||||
sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb";
|
||||
};
|
||||
|
||||
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjcat";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "hughsie";
|
||||
repo = "libjcat";
|
||||
rev = version;
|
||||
sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc";
|
||||
sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
{ stdenv, fetchgit, libtool, autoconf, automake }:
|
||||
{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmkv";
|
||||
version = "0.6.5.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/saintdev/libmkv.git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saintdev";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl";
|
||||
};
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libp11";
|
||||
version = "0.4.10";
|
||||
version = "0.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenSC";
|
||||
repo = "libp11";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1m4aw45bqichhx7cn78d8l1r1v0ccvwzlfj09fay2l9rfic5jgfz";
|
||||
sha256 = "0hcl706i04nw5c1sj7l6sj6m0yjq6qijz345v498jll58fp5wif8";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -69,6 +69,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
broken = versionAtLeast qtbase.version "5.15";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,24 +1,36 @@
|
||||
{ stdenv, fetchFromGitHub, openssl, doxygen
|
||||
, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }:
|
||||
let
|
||||
version = "0.6.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, doxygen
|
||||
, pkg-config
|
||||
, python3
|
||||
, python3Packages
|
||||
, wafHook
|
||||
, boost
|
||||
, openssl
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ndn-cxx";
|
||||
inherit version;
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "named-data";
|
||||
repo = "ndn-cxx";
|
||||
rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00";
|
||||
sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1lcaqc79n3d9sip7knddblba17sz18b0w7nlxmj3fz3lb3z9qd51";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
|
||||
|
||||
nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];
|
||||
|
||||
buildInputs = [ boost openssl sqlite ];
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--with-openssl=${openssl.dev}"
|
||||
"--boost-includes=${boost.dev}/include"
|
||||
"--boost-libs=${boost.out}/lib"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://named-data.net/";
|
||||
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
|
||||
@@ -36,7 +48,7 @@ stdenv.mkDerivation {
|
||||
and consuming less resources overall.
|
||||
'';
|
||||
license = licenses.lgpl3;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ maintainers.sjmackenzie ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sjmackenzie ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.0.11";
|
||||
version = "1.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0f3x5h0hdjiqgjf5mzzlprbhrbyabxllrjmlzgc9fv5rgqyyphj5";
|
||||
sha256 = "0xcra2hcsm88rfd7zf52hccx3nvg9j65a595z7c0lrzv6jz04676";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhdunn";
|
||||
repo = "pcaudiolib";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0";
|
||||
};
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tpm2-tss";
|
||||
version = "2.4.1";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpm2-software";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs";
|
||||
sha256 = "10wayqk7h1v3hdyd09rkjjs9989r968dpgf8m0xjqgn7q3y78n61";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, python, cmocka, hexdump, writeScriptBin, binutils-unwrapped }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unicorn-emulator";
|
||||
version = "1.0.2-rc4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/unicorn-engine/unicorn/archive/${version}.tar.gz";
|
||||
sha256 = "05w43jq3r97l3c8ggc745ai8m5l93p1b6q6cfp1zwzz6hl5kifiv";
|
||||
};
|
||||
|
||||
PREFIX = placeholder "out";
|
||||
MACOS_UNIVERSAL = stdenv.lib.optionalString stdenv.isDarwin "no";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkInputs = [
|
||||
cmocka
|
||||
hexdump
|
||||
python.pkgs.setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Lightweight multi-platform CPU emulator library";
|
||||
homepage = "http://www.unicorn-engine.org";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
|
||||
};
|
||||
}
|
||||
27
pkgs/development/libraries/unicorn/default.nix
Normal file
27
pkgs/development/libraries/unicorn/default.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgconfig
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unicorn";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unicorn-engine";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0jgnyaq6ykpbg5hrwc0p3pargmr9hpzqfsj6ymp4k07pxnqal76j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight multi-platform CPU emulator library";
|
||||
homepage = "http://www.unicorn-engine.org";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice luc65r ];
|
||||
};
|
||||
}
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "wiiuse";
|
||||
repo = "wiiuse";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13";
|
||||
};
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ let
|
||||
src = fetchFromBitbucket {
|
||||
owner = "multicoreware";
|
||||
repo = "x265_git";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn";
|
||||
};
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
|
||||
patches = [
|
||||
./lt_dladdsearchdir.patch
|
||||
];
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
|
||||
postPatch = ''
|
||||
substituteAllInPlace src/dl.c
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/tests/testEnc.sh 2020-04-20 14:30:32.000000000 -0400
|
||||
+++ b/tests/testEnc.sh 2020-10-21 22:09:25.000000000 -0400
|
||||
@@ -405,9 +405,6 @@
|
||||
else
|
||||
# generate binary file out of base64
|
||||
DECODE="-d"
|
||||
- if [ "`uname`" = "Darwin" ]; then
|
||||
- DECODE="-D"
|
||||
- fi
|
||||
cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3
|
||||
execEncTest "$res_success" \
|
||||
"" \
|
||||
Reference in New Issue
Block a user