Unverified Commit bf37b136 authored by David McFarland's avatar David McFarland Committed by GitHub
Browse files

godot_4{,-mono}: 4.3-stable -> 4.4-stable (#387031)

parents 39266d12 4f5970c8

pkgs/by-name/go/godot_4-mono/package.nix

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
{

  godot_4,

}:

godot_4.override {

  withMono = true;

}

pkgs/by-name/op/opengamepadui/package.nix

+7 −8
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
  dbus,

  fetchFromGitHub,

  gamescope,

  godot_4,

  godot_4-export-templates,

  godot_4_3,

  hwdata,

  lib,

  libGL,
@@ -46,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    autoPatchelfHook

    cargo

    godot_4

    godot_4-export-templates

    godot_4_3

    godot_4_3.export-templates-bin

    pkg-config

    rustPlatform.cargoSetupHook

  ];
@@ -76,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: { 


  env =

    let

      versionAndRelease = lib.splitString "-" godot_4.version;

      versionAndRelease = lib.splitString "-" godot_4_3.version;

    in

    {

      GODOT = lib.getExe godot_4;

      GODOT = lib.getExe godot_4_3;

      GODOT_VERSION = lib.elemAt versionAndRelease 0;

      GODOT_RELEASE = lib.elemAt versionAndRelease 1;

      EXPORT_TEMPLATE = "${godot_4-export-templates}";

      EXPORT_TEMPLATE = "${godot_4_3.export-templates-bin}";

      BUILD_TYPE = "${finalAttrs.buildType}";

    };
@@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { 
    # Godot looks for export templates in HOME

    export HOME=$(mktemp -d)

    mkdir -p $HOME/.local/share/godot/export_templates

    ln -s "${godot_4-export-templates}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"

    ln -s "${godot_4_3.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"

  '';



  postInstall = ''

pkgs/by-name/pi/pixelorama/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
  alsa-lib,

  autoPatchelfHook,

  fetchFromGitHub,

  godot_4,

  godot_4-export-templates,

  godot_4_3,

  libGL,

  libpulseaudio,

  libX11,
@@ -28,7 +27,8 @@ let 
    presets.${stdenv.hostPlatform.system}

      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");



  godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot_4.version;

  godot = godot_4_3;

  godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot.version;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "pixelorama";
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    autoPatchelfHook

    godot_4

    godot

  ];



  runtimeDependencies = map lib.getLib [
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { 


    export HOME=$(mktemp -d)

    mkdir -p $HOME/.local/share/godot/export_templates

    ln -s "${godot_4-export-templates}" "$HOME/.local/share/godot/export_templates/${godot_version_folder}"

    ln -s "${godot.export-templates-bin}" "$HOME/.local/share/godot/export_templates/${godot_version_folder}"

    mkdir -p build

    godot4 --headless --export-release "${preset}" ./build/pixelorama

pkgs/development/tools/godot/4.3/default.nix

0 → 100644
+6 −0
Original line number Diff line number Diff line 
{

  version = "4.3-stable";

  hash = "sha256-MzElflwXHWLgPtoOIhPLA00xX8eEdQsexZaGIEOzbj0=";

  exportTemplatesHash = "sha256-XRnKii+eexIkbGf7bqc42SR0NBULFvgMdOpSRNNk6kg=";

  nugetDeps = ./deps.json;

}

pkgs/by-name/go/godot_4/deps.json→pkgs/development/tools/godot/4.3/deps.json

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ 
    "version": "1.0.9",

    "hash": "sha256-7c5TRZ594tr1Fj5fNiXtPI0pcBuyX/3eU4x+it6Yzew="

  },

  {

    "pname": "Microsoft.AspNetCore.App.Ref",

    "version": "6.0.36",

    "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="

  },

  {

    "pname": "Microsoft.Bcl.AsyncInterfaces",

    "version": "1.1.1",
@@ -224,6 +229,11 @@ 
    "version": "17.7.1",

    "hash": "sha256-ySyNpRodd6R6qKnGrgwLYaiHZga2GL0fQARrYGIFa6k="

  },

  {

    "pname": "Microsoft.NETCore.App.Ref",

    "version": "6.0.36",

    "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="

  },

  {

    "pname": "Microsoft.NETCore.Platforms",

    "version": "1.0.1",