Add appName To options for flake. (#1993)

* adding appName to flake options and trying to work around hls issue. * updated appName in mkDerivation. * updated flake. * removing changes to hls from appName PR. * delted pName comments, fixed indentation and spacing around equals sign.
digitallyinduced · Aug 1, 2024 · 040d1b2 · 040d1b2
1 parent bfc37c4
commit 040d1b2
Show file tree

Hide file tree

Showing 3 changed files with 662 additions and 58 deletions.
diff --git a/NixSupport/default.nix b/NixSupport/default.nix
@@ -11,6 +11,7 @@
 , optimized ? false
 , includeDevTools ? !optimized # Include Postgres?
 , rtsFlags ? ""
+, appName ? "app"
 , optimizationLevel ? "2"
 }:
 
@@ -32,7 +33,7 @@ let
       else "build/bin/RunJobs";
 in
     pkgs.stdenv.mkDerivation {
-        name = "app";
+        name = appName;
         buildPhase = ''
           runHook preBuild
 

diff --git a/flake-module.nix b/flake-module.nix
@@ -52,6 +52,14 @@ ihpFlake:
                     ];
                 };
 
+                appName = lib.mkOption {
+                    description = '' 
+                        The derivation name.
+                    '';
+                    type = lib.types.str;
+                    default = "app";
+                };
+
                 projectPath = lib.mkOption {
                     description = ''
                         Path to the IHP project. You likely want to set this to `./.`.
@@ -139,6 +147,7 @@ ihpFlake:
                     pkgs = pkgs;
                     rtsFlags = cfg.rtsFlags;
                     optimizationLevel = cfg.optimizationLevel;
+                    appName = cfg.appName;
                 };
 
                 unoptimized-prod-server = import "${ihp}/NixSupport/default.nix" {
@@ -152,6 +161,7 @@ ihpFlake:
                     pkgs = pkgs;
                     rtsFlags = cfg.rtsFlags;
                     optimizationLevel = "0";
+                    appName = cfg.appName;
                 };
 
                 unoptimized-docker-image = pkgs.dockerTools.buildImage {