ma pkgs._4nxci: re-package 4nxci's version of mbedtls

1 files changed, 21 insertions, 23 deletions

diff --git a/makefu/5pkgs/4nxci/default.nix b/makefu/5pkgs/_4nxci/default.nix
index 3aba3be45..dafa37ff6 100644
--- a/makefu/5pkgs/4nxci/default.nix
+++ b/makefu/5pkgs/_4nxci/default.nix
@@ -1,33 +1,31 @@
-{ stdenv, lib, fetchFromGitHub, mbedtls, python2 }:
+{ stdenv, lib, fetchFromGitHub, mbedtls, python2, perl }:
 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";
-
+  version = "1.35";
   src = fetchFromGitHub {
     owner = "The-4n";
     repo = "4NXCI";
     rev = "v${version}";
-    sha256 = "0nrd19z88iahxcdx468lzgxlvkl65smwx8f9s19431cszyhvpxyh";
+    sha256 = "0yq0irxzi4wi71ajw8ld01zfpkrgknpq7g3m76pbnwmdzkm7dra6";
   };
 
+  mymbedtls = stdenv.mkDerivation {
+    name = "mbedtls-${version}";
+    version = "2.6.1";
+    doCheck = false;
+    inherit src;
+    buildInputs = [ perl ];
+    phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+    makeFlags = [ "DESTDIR=$(out)" ];
+    buildPhase = ''
+      cp config.mk.template config.mk
+      cd mbedtls
+      make
+    '';
+  };
+in stdenv.mkDerivation rec {
+  name = "4nxci-${version}";
+
+  inherit src version;
   buildPhase = ''
     cp config.mk.template config.mk
     sed -i 's#\(INCLUDE =\).*#\1${mymbedtls}/include#' Makefile