From 7425cd06fca780f559d4a5e9782c25232e59c83f Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Wed, 19 Apr 2023 11:43:39 +0200
Subject: flix: init at 0.35.0

---
 pkgs/development/compilers/flix/default.nix | 33 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/compilers/flix/default.nix

diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix
new file mode 100644
index 0000000000000..e4c21664b3ce2
--- /dev/null
+++ b/pkgs/development/compilers/flix/default.nix
@@ -0,0 +1,33 @@
+{ lib, fetchurl, stdenvNoCC, makeWrapper, jre }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "flix";
+  version = "0.35.0";
+
+  src = fetchurl {
+    url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
+    sha256 = "sha256-liPOAQfdAYc2JlUb+BXQ5KhTOYexC1vBCIuO0nT2jhk=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    export JAR=$out/share/java/${pname}/${pname}.jar
+    install -D $src $JAR
+    makeWrapper ${jre}/bin/java $out/bin/${pname} \
+      --add-flags "-jar $JAR"
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "The Flix Programming Language";
+    homepage = "https://github.com/flix/flix";
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    license = licenses.asl20;
+    maintainers = with maintainers; [ athas ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d0a2fae1726..5d8938ad64296 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2208,6 +2208,8 @@ with pkgs;
 
   flycast = callPackage ../applications/emulators/flycast { };
 
+  flix = callPackage ../development/compilers/flix { };
+
   fsrx = callPackage ../tools/misc/fsrx { };
 
   fsuae = callPackage ../applications/emulators/fs-uae { };
-- 
cgit 1.4.1


From 60eb9a470f5d1a2015e02496f01c1e56e315698f Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Fri, 21 Apr 2023 06:50:32 +0200
Subject: Update pkgs/development/compilers/flix/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/compilers/flix/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix
index e4c21664b3ce2..6e95e86e420a7 100644
--- a/pkgs/development/compilers/flix/default.nix
+++ b/pkgs/development/compilers/flix/default.nix
@@ -15,10 +15,12 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    export JAR=$out/share/java/${pname}/${pname}.jar
+
+    export JAR=$out/share/java/flix/flix.jar
     install -D $src $JAR
-    makeWrapper ${jre}/bin/java $out/bin/${pname} \
+    makeWrapper ${jre}/bin/java $out/bin/flix \
       --add-flags "-jar $JAR"
+
     runHook postInstall
   '';
 
-- 
cgit 1.4.1


From 96ef490147083133d64118f5cb4967cd93546789 Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Fri, 21 Apr 2023 06:50:41 +0200
Subject: Update pkgs/development/compilers/flix/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/compilers/flix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix
index 6e95e86e420a7..2b4c8dc50f2bf 100644
--- a/pkgs/development/compilers/flix/default.nix
+++ b/pkgs/development/compilers/flix/default.nix
@@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.asl20;
     maintainers = with maintainers; [ athas ];
-    platforms = platforms.all;
+    inherit (jre.meta) platforms;
   };
 }
-- 
cgit 1.4.1