Unverified Commit 8d0298e6 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

godot*: move env variable to env for structuredAttrs (#491924)

parents f8b98dba f61bd494

pkgs/development/tools/godot/common.nix

+16 −15
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ let 
        ++ lib.optional editor "man";

        separateDebugInfo = true;



        env = {

          # Set the build name which is part of the version. In official downloads, this

          # is set to 'official'. When not specified explicitly, it is set to

          # 'custom_build'. Other platforms packaging Godot (Gentoo, Arch, Flatpack
@@ -381,6 +382,13 @@ let 
          # See also 'methods.py' in the Godot repo and 'build' in

          # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info

          BUILD_NAME = "nixpkgs";

        }

        // lib.optionalAttrs stdenv.hostPlatform.isDarwin {

          NIX_CFLAGS_COMPILE = toString [

            "-I${lib.getDev harfbuzz-icu}/include/harfbuzz"

            "-I${lib.getDev recastnavigation}/include/recastnavigation"

          ];

        };



        preConfigure = lib.optionalString (editor && withMono) ''

          # TODO: avoid pulling in dependencies of windows-only project
@@ -553,13 +561,6 @@ let 
          pkg-config

        ];



        env.NIX_CFLAGS_COMPILE = toString (

          lib.optionals stdenv.hostPlatform.isDarwin [

            "-I${lib.getDev harfbuzz-icu}/include/harfbuzz"

            "-I${lib.getDev recastnavigation}/include/recastnavigation"

          ]

        );



        buildInputs =

          lib.optionals (!withBuiltins) (

            [