Revert "crystal: build using Makefile or shards if available"

This reverts commit 2ec0ad59849ee1a652a6534a2d2672fdb7b5fed5.

pkgs/development/compilers/crystal/build-package.nix

@@ -1,9 +1,6 @@
-{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub }:
+{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }:
-{
+{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root
-  # Some projects do not include a lock file, so you can pass one
+  shardsFile ? null
-  lockFile ? null
-  # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root
-, shardsFile ? null
   # Specify binaries to build in the form { foo.src = "src/foo.cr"; }
   # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; }
 , crystalBinaries ? {}
@@ -12,102 +9,45 @@
 let
   mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ];
 
-  crystalLib = linkFarm "crystal-lib" (
+  crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: {
-    lib.mapAttrsToList (
+    inherit name;
-      name: value: {
+    path = fetchFromGitHub value;
-        inherit name;
+  }) (import shardsFile));
-        path = fetchFromGitHub value;
-      }
-    ) (import shardsFile)
-  );
 
-  # we previously had --no-debug here but that is not recommended by upstream
+  defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ];
-  defaultOptions = [ "--release" "--progress" "--verbose" ];
 
-  buildDirectly = shardsFile == null || crystalBinaries != {};
+in stdenv.mkDerivation (mkDerivationArgs // {
-in
-stdenv.mkDerivation (
-  mkDerivationArgs // {
 
-    configurePhase = args.configurePhase or ''
+  configurePhase = args.configurePhase or ''
-      runHook preConfigure
+    runHook preConfigure
+    ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"}
+    runHook postConfigure
+  '';
 
-      ${lib.optionalString (lockFile != null) "ln -s ${lockFile} ./shard.lock"}
+  buildInputs = args.buildInputs or [] ++ [ crystal ];
-      ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"}
 
-      runHook postConfigure
+  buildPhase = args.buildPhase or ''
-    '';
+    runHook preBuild
+    ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: ''
+      crystal ${lib.escapeShellArgs ([
+        "build"
+        "-o" bin
+        (attrs.src or (throw "No source file for crystal binary ${bin} provided"))
+      ] ++ attrs.options or defaultOptions)}
+    '') crystalBinaries)}
+    runHook postBuild
+  '';
 
-    CRFLAGS = lib.concatStringsSep " " defaultOptions;
+  installPhase = args.installPhase or ''
+    runHook preInstall
+    mkdir -p "$out/bin"
+    ${lib.concatMapStringsSep "\n" (bin: ''
+      mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]}
+    '') (lib.attrNames crystalBinaries)}
+    runHook postInstall
+  '';
 
-    buildInputs = args.buildInputs or [] ++ [ crystal shards ];
+  meta = args.meta or {} // {
-
+    platforms = args.meta.platforms or crystal.meta.platforms;
-    nativeBuildInputs = args.nativeBuildInputs or [] ++ [ git pkgconfig which ];
+  };
-
+})
-    buildPhase = args.buildPhase or (
-      ''
-        runHook preBuild
-
-        if [ -e Makefile ]; then
-          echo " ** building with make"
-
-          make ''${buildTargets:-build} $buildFlags
-        else
-      '' + (
-        if buildDirectly then ''
-          echo " ** building with crystal"
-
-          ${lib.concatStringsSep "\n" (
-          lib.mapAttrsToList (
-            bin: attrs: ''
-              crystal ${lib.escapeShellArgs (
-              [
-                "build"
-                "-o"
-                bin
-                (attrs.src or (throw "No source file for crystal binary ${bin} provided"))
-              ] ++ attrs.options or defaultOptions
-            )}
-            ''
-          ) crystalBinaries
-        )}
-        '' else ''
-          echo " ** building with shards"
-          shards build --local --production ${lib.concatStringsSep " " defaultOptions}
-        ''
-      ) + ''
-        fi
-
-        runHook postBuild
-      ''
-    );
-
-    installPhase = args.installPhase or (
-      ''
-        runHook preInstall
-
-        if [ -e Makefile ]; then
-          make ''${installTargets:-install} $installFlags
-        else
-      '' + (
-        if buildDirectly then
-          lib.concatMapStringsSep "\n" (
-            bin: ''
-              install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]}
-            ''
-          ) (lib.attrNames crystalBinaries)
-        else ''
-          shards install
-        ''
-      ) + ''
-        fi
-
-        runHook postInstall
-      ''
-    );
-
-    meta = args.meta or {} // {
-      platforms = args.meta.platforms or crystal.meta.platforms;
-    };
-  }
-)