Unverified Commit 33e6de6e authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

retroarch-bare: use structuredAttrs instead of passAsFile (#502702)

parents 2c8241b8 321ebc05

pkgs/by-name/re/retroarch-bare/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
  retroarch-assets,

  retroarch-bare,

  retroarch-joypad-autoconfig,

  runCommand,

  writeText,

  symlinkJoin,

  # params

  enableNvidiaCgToolkit ? false,
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { 
          libretro

          makeBinaryWrapper

          retroarch-bare

          runCommand

          writeText

          symlinkJoin

          cores

          ;

pkgs/by-name/re/retroarch-bare/wrapper.nix

+4 −10
Original line number Diff line number Diff line
@@ -3,22 +3,16 @@ 
  libretro,

  makeBinaryWrapper,

  retroarch-bare,

  runCommand,

  writeText,

  symlinkJoin,

  cores ? [ ],

  settings ? { },

}:



let

  settingsPath =

    runCommand "declarative-retroarch.cfg"

      {

        value = lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "${n} = \"${v}\"") settings);

        passAsFile = [ "value" ];

      }

      ''

        cp "$valuePath" "$out"

      '';

  settingsPath = writeText "declarative-retroarch.cfg" (

    lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "${n} = \"${v}\"") settings)

  );



  # All cores should be located in the same path after symlinkJoin,

  # but let's be safe here