cosmocc: move to cosmopolitan

Also, a refactor.

5 files changed, 39 insertions, 35 deletions

diff --git a/pkgs/by-name/co/cosmopolitan/cosmocc.nix b/pkgs/by-name/co/cosmopolitan/cosmocc.nix
new file mode 100644
index 00000000000..fb3ca66025a
--- /dev/null
+++ b/pkgs/by-name/co/cosmopolitan/cosmocc.nix
@@ -0,0 +1,25 @@
+{ runCommand, cosmopolitan }:
+
+let
+  cosmocc = runCommand "cosmocc-${cosmopolitan.version}"
+    {
+      pname = "cosmocc";
+      inherit (cosmopolitan) version;
+
+      passthru.tests = {
+        cc = runCommand "c-test" { } ''
+          ${cosmocc}/bin/cosmocc ${./hello.c}
+          ./a.out > $out
+        '';
+      };
+
+      meta = cosmopolitan.meta // {
+        description = "compilers for Cosmopolitan C/C++ programs";
+      };
+    } ''
+        mkdir -p $out/bin
+        install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin
+        sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/*
+      '';
+in
+cosmocc
diff --git a/pkgs/by-name/co/cosmopolitan/hello.c b/pkgs/by-name/co/cosmopolitan/hello.c
new file mode 100644
index 00000000000..f8edd23561e
--- /dev/null
+++ b/pkgs/by-name/co/cosmopolitan/hello.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+    printf("Hello world!\n");
+    return 0;
+}
diff --git a/pkgs/by-name/co/cosmopolitan/package.nix b/pkgs/by-name/co/cosmopolitan/package.nix
index acc8386e78b..defc3efb8d1 100644
--- a/pkgs/by-name/co/cosmopolitan/package.nix
+++ b/pkgs/by-name/co/cosmopolitan/package.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , bintools-unwrapped
+, callPackage
 , coreutils
 , substituteAll
 , unzip
@@ -74,6 +75,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    cosmocc = callPackage ./cosmocc.nix {
+      cosmopolitan = finalAttrs.finalPackage;
+    };
+  };
+
   meta = {
     homepage = "https://justine.lol/cosmopolitan/";
     description = "Your build-once run-anywhere c library";
diff --git a/pkgs/development/tools/cosmocc/default.nix b/pkgs/development/tools/cosmocc/default.nix
deleted file mode 100644
index c3db97dfdc6..00000000000
--- a/pkgs/development/tools/cosmocc/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ runCommand, cosmopolitan }:
-
-let
-  inherit (cosmopolitan) version;
-
-  cosmocc =
-    runCommand "cosmocc-${version}"
-      {
-        pname = "cosmocc";
-        inherit version;
-
-        meta = cosmopolitan.meta // {
-          description = "compilers for Cosmopolitan C/C++ programs";
-        };
-        passthru.tests = {
-          cc = runCommand "c-test" { } ''
-            cat > hello.c << END
-            #include <stdio.h>
-            int main() {
-              printf("Hello world!\n");
-              return 0;
-            }
-            END
-            ${cosmocc}/bin/cosmocc hello.c
-            ./a.out > $out
-          '';
-        };
-      } ''
-      mkdir -p $out/bin
-      install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin
-      sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/*
-    '';
-in
-cosmocc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c01a15d26c6..2251a98c4e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20921,7 +20921,7 @@ with pkgs;
 
   cog = callPackage ../development/web/cog { };
 
-  cosmocc = callPackage ../development/tools/cosmocc { };
+  inherit (cosmopolitan) cosmocc;
 
   python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { };