From 64cbf9f0deadc90709a3fc02f2191ce30b8b018f Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 3 Nov 2020 22:54:07 +0100
Subject: [PATCH 1/2] mlc: init at 3.9

https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html
---
 pkgs/tools/system/mlc/default.nix | 34 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/system/mlc/default.nix

diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix
new file mode 100644
index 00000000000..fc9302e2698
--- /dev/null
+++ b/pkgs/tools/system/mlc/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, patchelf, lib }:
+stdenv.mkDerivation rec {
+  pname = "mlc";
+  version = "3.9";
+
+  src = fetchurl {
+    url = "https://software.intel.com/content/dam/develop/external/us/en/protected/mlc_v${version}.tgz";
+    sha256 = "1x7abm9hbv9hkqa3cgxz6l04m3ycyl40i4zgx1w819pc10n6dhdb";
+  };
+
+  sourceRoot = "Linux";
+
+  nativeBuildInputs = [ patchelf ];
+
+  phases = [ "unpackPhase" "installPhase" "patchPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp mlc $out/bin/mlc
+    chmod +x $out/bin/mlc
+  '';
+
+  patchPhase = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc
+  '';
+
+  meta = {
+    homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html";
+    description = "Intel Memory Latency Checker";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ basvandijk ];
+    platforms = with lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e65aa28b25b..906513efb3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14643,6 +14643,8 @@ in
     withGUI = false;
   };
 
+  mlc = callPackage ../tools/system/mlc { };
+
   mlt = callPackage ../development/libraries/mlt { };
 
   mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };

From f8e066b5ed0980ca6acccf6b701cc129a855c7cb Mon Sep 17 00:00:00 2001
From: Bas van Dijk <bas@dfinity.org>
Date: Wed, 4 Nov 2020 09:24:38 +0000
Subject: [PATCH 2/2] mlc: refactoring

---
 pkgs/tools/system/mlc/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/tools/system/mlc/default.nix
index fc9302e2698..d055c98e04c 100644
--- a/pkgs/tools/system/mlc/default.nix
+++ b/pkgs/tools/system/mlc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, lib }:
+{ stdenv, fetchurl, patchelf }:
 stdenv.mkDerivation rec {
   pname = "mlc";
   version = "3.9";
@@ -10,25 +10,21 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "Linux";
 
-  nativeBuildInputs = [ patchelf ];
-
-  phases = [ "unpackPhase" "installPhase" "patchPhase" ];
-
   installPhase = ''
-    mkdir -p $out/bin
-    cp mlc $out/bin/mlc
-    chmod +x $out/bin/mlc
+    install -Dm755 mlc $out/bin/mlc
   '';
 
-  patchPhase = ''
+  nativeBuildInputs = [ patchelf ];
+
+  fixupPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html";
     description = "Intel Memory Latency Checker";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ basvandijk ];
-    platforms = with lib.platforms; linux;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ basvandijk ];
+    platforms = with platforms; linux;
   };
 }