Skip to content

Commit 523ff12

Browse files
author
Tom Sydney Kerckhove
committed
fixed the generation script a bit
1 parent adb15a7 commit 523ff12

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

nix/generate-client.nix

+7-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ with pkgs.lib;
1212
with pkgs.haskell.lib;
1313
let
1414
localPkgs = import ./pkgs.nix;
15-
extraFlagsStr = concatStringsSep "\\\n" extraFlags;
16-
operationFlag = operation: "--operation-to-generate \"${operation}\" \\";
15+
extraFlagsStr = concatStringsSep " " extraFlags;
16+
operationFlag = operation: "--operation-to-generate '${operation}'";
1717
operationsFlags = optionalString (operations != [ ]) ''
18-
--omit-additional-operation-functions \
19-
${concatStringsSep "\n" (map operationFlag operations)}
18+
--omit-additional-operation-functions ${concatStringsSep " " (map operationFlag operations)}
2019
'';
2120
generatedCode = pkgs.stdenv.mkDerivation {
2221
name = "generated-${name}";
@@ -28,13 +27,16 @@ let
2827
export LANG=C.utf8
2928
export LC_ALL=C.utf8
3029
30+
set -x
31+
3132
openapi3-code-generator-exe ${src} \
3233
--module-name "${moduleName}" \
3334
--package-name "${packageName}" \
3435
--output-dir "$out" \
3536
${extraFlagsStr} \
36-
\
3737
${operationsFlags}
38+
39+
set +x
3840
'';
3941
};
4042
generatedPackage = dontHaddock (disableLibraryProfiling (pkgs.haskellPackages.callCabal2nix name generatedCode { }));

0 commit comments

Comments
 (0)