parent
a67b0cf727
commit
6a830f556a
|
@ -295,4 +295,4 @@ in {
|
||||||
{ pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }
|
{ pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }
|
||||||
];
|
];
|
||||||
since-2_9_1 = [];
|
since-2_9_1 = [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -192,4 +192,4 @@
|
||||||
(fetchNuGet { pname = "Vortice.MediaFoundation"; version = "2.4.2"; sha256 = "0nk8r564w8x791nqn5457jcq0gj7v6k5v1mziisqy4945byjxcdl"; })
|
(fetchNuGet { pname = "Vortice.MediaFoundation"; version = "2.4.2"; sha256 = "0nk8r564w8x791nqn5457jcq0gj7v6k5v1mziisqy4945byjxcdl"; })
|
||||||
(fetchNuGet { pname = "Vortice.XAudio2"; version = "2.4.2"; sha256 = "0iwnaa0jdl3782k9i9j2c0s7lyxjky1ph6i8dv12w3ym2p19h3qc"; })
|
(fetchNuGet { pname = "Vortice.XAudio2"; version = "2.4.2"; sha256 = "0iwnaa0jdl3782k9i9j2c0s7lyxjky1ph6i8dv12w3ym2p19h3qc"; })
|
||||||
(fetchNuGet { pname = "Vortice.XInput"; version = "2.4.2"; sha256 = "0qpnih6k6mbc027f3hka5588j2v7m1hf81lh29whcww1cqw89sxm"; })
|
(fetchNuGet { pname = "Vortice.XInput"; version = "2.4.2"; sha256 = "0qpnih6k6mbc027f3hka5588j2v7m1hf81lh29whcww1cqw89sxm"; })
|
||||||
]
|
]
|
||||||
|
|
|
@ -39,4 +39,4 @@
|
||||||
(lib.splitString "`")
|
(lib.splitString "`")
|
||||||
(ifilter0 (i: _: lib.mod i 2 == 1))
|
(ifilter0 (i: _: lib.mod i 2 == 1))
|
||||||
];
|
];
|
||||||
in { missing = lib.subtractLists ac ex; extra = lib.subtractLists ex ac; }
|
in { missing = lib.subtractLists ac ex; extra = lib.subtractLists ex ac; }
|
||||||
|
|
|
@ -212,4 +212,4 @@ in {
|
||||||
hashPrePatching = "sha256-AHP1mgedC9wUq+YAJD0gM4Lrl0H0UkrWyifEDC9KLog=";
|
hashPrePatching = "sha256-AHP1mgedC9wUq+YAJD0gM4Lrl0H0UkrWyifEDC9KLog=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,4 +108,4 @@ in {
|
||||||
exec '${lib.getBin bizhawkAssemblies.mono}/bin/mono' "$BIZHAWK_HOME/DiscoHawk.exe" "$@"
|
exec '${lib.getBin bizhawkAssemblies.mono}/bin/mono' "$BIZHAWK_HOME/DiscoHawk.exe" "$@"
|
||||||
'';
|
'';
|
||||||
emuhawkNonNixOS = writeShellScript "emuhawk-mono-wrapper-non-nixos" ''exec '${nixGL}/bin/nixGL' '${emuhawk}' "$@"'';
|
emuhawkNonNixOS = writeShellScript "emuhawk-mono-wrapper-non-nixos" ''exec '${nixGL}/bin/nixGL' '${emuhawk}' "$@"'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,4 +40,4 @@ printf "Packaging releases.\n"
|
||||||
for a in $attrNamesToCheck; do
|
for a in $attrNamesToCheck; do
|
||||||
b -A "$a-bin"
|
b -A "$a-bin"
|
||||||
b -A "$a-bin.assemblies" --check
|
b -A "$a-bin.assemblies" --check
|
||||||
done
|
done
|
||||||
|
|
|
@ -77,4 +77,4 @@ emuhawk-monort-local # = `cd output && mono EmuHawk.exe`
|
||||||
|
|
||||||
# if deps (besides NuGet packages) have changed, may need to do this instead, but it will do a slow copy of the repo to the Nix store
|
# if deps (besides NuGet packages) have changed, may need to do this instead, but it will do a slow copy of the repo to the Nix store
|
||||||
nix-shell -A emuhawk
|
nix-shell -A emuhawk
|
||||||
```
|
```
|
||||||
|
|
|
@ -17,4 +17,4 @@ in { #TODO build all but flatBuffersCore, gongShell, slimDX, and systemDataSqlit
|
||||||
srcGenVersionInfo = grabFromReferences { filePfx = "BizHawk.SrcGen.VersionInfo"; };
|
srcGenVersionInfo = grabFromReferences { filePfx = "BizHawk.SrcGen.VersionInfo"; };
|
||||||
systemDataSqliteDropIn = grabFromReferences { filePfx = "System.Data.SQLite"; subdir = "/x64/SQLite"; };
|
systemDataSqliteDropIn = grabFromReferences { filePfx = "System.Data.SQLite"; subdir = "/x64/SQLite"; };
|
||||||
virtu = grabFromReferences { filePfx = "Virtu"; };
|
virtu = grabFromReferences { filePfx = "Virtu"; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -304,4 +304,4 @@ in {
|
||||||
pname = "emuhawk-monort";
|
pname = "emuhawk-monort";
|
||||||
launchScriptAttrName = if forNixOS then "emuhawk" else "emuhawkNonNixOS";
|
launchScriptAttrName = if forNixOS then "emuhawk" else "emuhawkNonNixOS";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -144,4 +144,4 @@ in combined // lib.listToAttrs (lib.concatLists (builtins.map
|
||||||
{ name = f "latest-bin"; value = combined.${f "${latestVersionFrag}-bin"}; }
|
{ name = f "latest-bin"; value = combined.${f "${latestVersionFrag}-bin"}; }
|
||||||
{ name = f "latest"; value = combined.${f latestVersionFrag}; }
|
{ name = f "latest"; value = combined.${f latestVersionFrag}; }
|
||||||
])
|
])
|
||||||
[ (s: "bizhawkAssemblies-${s}") (s: "emuhawk-${s}") (s: "discohawk-${s}") ]))
|
[ (s: "bizhawkAssemblies-${s}") (s: "emuhawk-${s}") (s: "discohawk-${s}") ]))
|
||||||
|
|
|
@ -38,4 +38,4 @@
|
||||||
(lib.mapAttrs (_: asms: lib.traceIf (lib.hasSuffix "-bin" asms.name) "the attr specified packages BizHawk from release artifacts; some builddeps may be missing from this shell"
|
(lib.mapAttrs (_: asms: lib.traceIf (lib.hasSuffix "-bin" asms.name) "the attr specified packages BizHawk from release artifacts; some builddeps may be missing from this shell"
|
||||||
f asms))
|
f asms))
|
||||||
];
|
];
|
||||||
in shells // shells.emuhawk-latest
|
in shells // shells.emuhawk-latest
|
||||||
|
|
Loading…
Reference in New Issue