summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-10-09 11:30:02 +0200
committerlassulus <lass@blue.r>2018-10-09 11:30:02 +0200
commit5ac5ee66bd006cd6161a05c35a2df088abe0616b (patch)
treebb34b0506da2fca7e7eb19eb7e3469e752e2e415 /makefu
parent1f23af4309d077a4a98c2ad8539db12d062842a5 (diff)
parent29d4f4357afc0965c73f7ed33c3f03880e8e84e2 (diff)
Merge branch '18.09'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/5pkgs/4nxci/default.nix52
-rw-r--r--makefu/krops.nix5
2 files changed, 53 insertions, 4 deletions
diff --git a/makefu/5pkgs/4nxci/default.nix b/makefu/5pkgs/4nxci/default.nix
new file mode 100644
index 000000000..3aba3be45
--- /dev/null
+++ b/makefu/5pkgs/4nxci/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, fetchFromGitHub, mbedtls, python2 }:
+let
+
+ mymbedtls = lib.overrideDerivation mbedtls (old: rec {
+ name = "mbedtls-${version}";
+ version = "2.13.0";
+ src = fetchFromGitHub {
+ owner = "ARMmbed";
+ repo = "mbedtls";
+ rev = name;
+ sha256 = "1257kp7yxkwwbx5v14kmrmgk1f9zagiddg5alm4wbj0pmgbrm14j";
+ };
+ buildInputs = old.buildInputs ++ [ python2 ];
+ postConfigure = ''
+ perl scripts/config.pl set MBEDTLS_CMAC_C
+ '';
+ doCheck = false;
+
+ });
+in stdenv.mkDerivation rec {
+ name = "4nxci-${version}";
+ version = "1.30";
+
+ src = fetchFromGitHub {
+ owner = "The-4n";
+ repo = "4NXCI";
+ rev = "v${version}";
+ sha256 = "0nrd19z88iahxcdx468lzgxlvkl65smwx8f9s19431cszyhvpxyh";
+ };
+
+ buildPhase = ''
+ cp config.mk.template config.mk
+ sed -i 's#\(INCLUDE =\).*#\1${mymbedtls}/include#' Makefile
+ sed -i 's#\(LIBDIR =\).*#\1${mymbedtls}/lib#' Makefile
+ make 4nxci
+ '';
+
+ installPhase = ''
+ install -m755 -D 4nxci $out/bin/4nxci
+ '';
+
+ #preInstall = ''
+ # mkdir -p $out/bin
+ #'';
+
+ buildInputs = [ mymbedtls ];
+
+ meta = {
+ description = "convert xci to nsp";
+ license = lib.licenses.isc;
+ };
+}
diff --git a/makefu/krops.nix b/makefu/krops.nix
index ddb4afece..4f55915af 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -1,8 +1,5 @@
{ config ? config, name, target ? name }: let
- krops = builtins.fetchGit {
- url = https://cgit.krebsco.de/krops/;
- rev = "4e466eaf05861b47365c5ef46a31a188b70f3615";
- };
+ krops = ../submodules/krops;
nixpkgs-src = lib.importJSON ./nixpkgs.json;
lib = import "${krops}/lib";