3 files changed, 50 insertions, 66 deletions
diff --git a/makefu/5pkgs/_4nxci/default.nix b/makefu/5pkgs/_4nxci/default.nix
new file mode 100644
index 000000000..dafa37ff6
--- /dev/null
+++ b/makefu/5pkgs/_4nxci/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, lib, fetchFromGitHub, mbedtls, python2, perl }:
+let
+  version = "1.35";
+  src = fetchFromGitHub {
+    owner = "The-4n";
+    repo = "4NXCI";
+    rev = "v${version}";
+    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
+    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/5pkgs/jd-gui/default.nix b/makefu/5pkgs/jd-gui/default.nix
deleted file mode 100644
index adefd80dd..000000000
--- a/makefu/5pkgs/jd-gui/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl, jre, makeWrapper, unzip }:
-stdenv.mkDerivation rec {
-  name = "${packageName}-${version}";
-  packageName = "jd-gui";
-  version  = "1.4.0";
-
-  src = fetchurl {
-    url = "https://github.com/java-decompiler/jd-gui/releases/download/v${version}/${name}.jar";
-    sha256 = "0rvbplkhafb6s9aiwgcq4ffz4bvzyp7q511pd46hx4ahhzfg7lmx";
-  };
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    f=$out/lib/jd-gui/
-    bin=$out/bin
-    name=$(basename $src)
-    mkdir -p $f $bin
-
-    # fixup path to java
-    cp $src $f
-    cat > $bin/jd-gui <<EOF
-    #!/bin/sh
-    exec ${pkgs.jre}/bin/java -jar $f/$name \$@
-    EOF
-    chmod +x $bin/jd-gui
-  '';
-
-  meta = {
-    homepage = https://github.com/java-decompiler/jd-gui;
-    description = "A standalone Java Decompiler GUI";
-    license = lib.licenses.gpl3;
-  };
-}
diff --git a/makefu/5pkgs/zj-58/default.nix b/makefu/5pkgs/zj-58/default.nix
deleted file mode 100644
index 6eda84959..000000000
--- a/makefu/5pkgs/zj-58/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchFromGitHub, cups}:
-
-stdenv.mkDerivation rec {
-  name = "cups-zj58-2018-02-22";
-
-  src = fetchFromGitHub {
-    owner = "klirichek";
-    repo = "zj-58";
-    rev = "e4212cd";
-    sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi";
-  };
-
-  buildInputs = [cups];
-
-  installPhase = ''
-    mkdir -p $out/lib/cups/filter
-
-    cp rastertozj $out/lib/cups/filter
-
-
-    mkdir -p $out/share/cups/model/zjiang
-    cp ZJ-58.ppd $out/share/cups/model/zjiang/
-  '';
-
-  meta = {
-    description = "CUPS filter for thermal printer Zjiang ZJ-58";
-    homepage = https://github.com/klirichek/zj-58;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}