x16: move from commanderx16
Now they live under x16 attribute. Since the old names are easier to use and remember, they should be kept as non-removable aliases.
This commit is contained in:
parent
bf8db64ddb
commit
5f0c17edea
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, callPackage
|
||||
, zlib
|
||||
}:
|
||||
|
||||
@ -41,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# upstream project recommends emulator and rom to be synchronized; passing
|
||||
# through the version is useful to ensure this
|
||||
inherit (finalAttrs) version;
|
||||
emulator = finalAttrs.finalPackage;
|
||||
rom = callPackage ./rom.nix { };
|
||||
run = (callPackage ./run.nix { }){
|
||||
inherit (finalAttrs.finalPackage) emulator rom;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
@ -35,3 +35,4 @@ symlinkJoin {
|
||||
# 1. Parse the command line in order to allow the user to set an optional
|
||||
# rom-file
|
||||
# 2. generate runScript based on symlinkJoin (maybe a postBuild?)
|
||||
# 3. a NixOS module to abstract the runner
|
@ -2956,14 +2956,10 @@ with pkgs;
|
||||
branch = "early-access";
|
||||
};
|
||||
|
||||
### APPLICATIONS/EMULATORS/COMMANDERX16
|
||||
|
||||
x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { };
|
||||
x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { };
|
||||
x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) {
|
||||
emulator = x16-emulator;
|
||||
rom = x16-rom;
|
||||
};
|
||||
# Aliases kept here because they are easier to use
|
||||
x16-emulator = x16.emulator;
|
||||
x16-rom = x16.rom;
|
||||
x16-run = x16.run;
|
||||
|
||||
yabause = libsForQt5.callPackage ../applications/emulators/yabause {
|
||||
freeglut = null;
|
||||
|
Loading…
Reference in New Issue
Block a user