Skip to content

Commit

Permalink
bigpemu: init at 1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tombert
Tombert committed Dec 22, 2024
1 parent f610ee3 commit 5a88161
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 47 deletions.
13 changes: 8 additions & 5 deletions pkgs/by-name/bi/bigpemu/package.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
glui,
libGLU,
libGL,
buildFHSUserEnv,
buildFHSEnv,
}:

let
Expand Down Expand Up @@ -40,17 +40,20 @@ let

dontPatchELF = true;

meta = with lib; {
meta = {
description = "Atari Jaguar Emulator (BigPEmu) by Richard Whitehouse";
homepage = "https://www.richwhitehouse.com/jaguar/index.php";
license = licenses.unfree;
maintainers = [ maintainers.tombert ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [
tombert
hughobrien
];
platforms = [ "x86_64-linux" ];
};
};

in
buildFHSUserEnv {
buildFHSEnv {
name = "bigpemu";
targetPkgs = pkgs: [
SDL2
Expand Down
79 changes: 37 additions & 42 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,6 @@ with pkgs;
};

aegisub = callPackage ../by-name/ae/aegisub/package.nix ({
boost = boost179;
luajit = luajit.override { enable52Compat = true; };
wxGTK = wxGTK32;
} // (config.aegisub or {}));
Expand Down Expand Up @@ -1440,9 +1439,6 @@ with pkgs;

winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };

bigpemu = callPackage ../by-name/bi/bigpemu/package.nix {
buildFHSUserEnv = buildFHSEnv;
};
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };

Expand Down Expand Up @@ -1665,10 +1661,6 @@ with pkgs;
inherit (callPackages ../data/fonts/arphic {})
arphic-ukai arphic-uming;

asciinema-agg = callPackage ../tools/misc/asciinema-agg {
inherit (darwin.apple_sdk.frameworks) Security;
};

asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };

atomicparsley = callPackage ../tools/video/atomicparsley {
Expand Down Expand Up @@ -2157,8 +2149,6 @@ with pkgs;

clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };

clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };

coloredlogs = with python3Packages; toPythonApplication coloredlogs;

czkawka-full = czkawka.wrapper.override {
Expand Down Expand Up @@ -2293,17 +2283,7 @@ with pkgs;

electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { };

element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
};
element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh
NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@"
'';

element-web-unwrapped = callPackage ../applications/networking/instant-messengers/element/element-web.nix { };

element-web = callPackage ../applications/networking/instant-messengers/element/element-web-wrapper.nix {
element-web = callPackage ../by-name/el/element-web/package.nix {
conf = config.element-web.conf or { };
};

Expand Down Expand Up @@ -2610,8 +2590,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};

odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { };

pastel = callPackage ../applications/misc/pastel {
inherit (darwin.apple_sdk.frameworks) Security;
};
Expand Down Expand Up @@ -3527,7 +3505,7 @@ with pkgs;
};
dapl-native = callPackage ../development/interpreters/dzaima-apl {
buildNativeImage = true;
jdk = graalvm-ce;
jdk = graalvmPackages.graalvm-ce;
};

gnucap-full = gnucap.withPlugins(p: [ p.verilog ]);
Expand Down Expand Up @@ -3807,8 +3785,6 @@ with pkgs;

iaito = libsForQt5.callPackage ../tools/security/iaito { };

jamulus = libsForQt5.callPackage ../applications/audio/jamulus { };

icemon = libsForQt5.callPackage ../applications/networking/icemon { };

icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;
Expand Down Expand Up @@ -6524,10 +6500,9 @@ with pkgs;
openjdk = jdk;
openjdk_headless = jdk_headless;

graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { });
graalvm-ce = graalvmCEPackages.graalvm-ce;
graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image {
graalvmDrv = graalvm-ce;
graalvmDrv = graalvmPackages.graalvm-ce;
}).override;

openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt {
Expand Down Expand Up @@ -7161,7 +7136,7 @@ with pkgs;

dbqn-native = dbqn.override {
buildNativeImage = true;
jdk = graalvm-ce;
jdk = graalvmPackages.graalvm-ce;
};

cliscord = callPackage ../misc/cliscord {
Expand Down Expand Up @@ -8902,10 +8877,7 @@ with pkgs;
dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { };
dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };

makeDBusConf = { suidHelper, serviceDirectories, apparmor ? "disabled" }:
callPackage ../development/libraries/dbus/make-dbus-conf.nix {
inherit suidHelper serviceDirectories apparmor;
};
makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { };

dee = callPackage ../development/libraries/dee {
autoreconfHook = buildPackages.autoreconfHook269;
Expand Down Expand Up @@ -11234,6 +11206,11 @@ with pkgs;
go = buildPackages.go_1_23;
};

go_1_24 = callPackage ../development/compilers/go/1.24.nix { };
buildGo124Module = callPackage ../build-support/go/module.nix {
go = buildPackages.go_1_24;
};

### DEVELOPMENT / HARE

hareHook = callPackage ../by-name/ha/hare/hook.nix { };
Expand Down Expand Up @@ -12122,7 +12099,6 @@ with pkgs;
tt-rss = callPackage ../servers/tt-rss { };
inherit (callPackages ../servers/web-apps/matomo {})
matomo
matomo_5
matomo-beta;

unpackerr = callPackage ../servers/unpackerr {
Expand Down Expand Up @@ -13949,7 +13925,12 @@ with pkgs;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};

freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };
inherit
({
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };
})
freeoffice
;

inherit (xorg) xlsfonts;

Expand Down Expand Up @@ -14185,8 +14166,6 @@ with pkgs;
singularity-overriden-nixos
;

slack = callPackage ../applications/networking/instant-messengers/slack { };

sosreport = python3Packages.callPackage ../applications/logging/sosreport { };

inherit (callPackages ../development/libraries/wlroots {})
Expand Down Expand Up @@ -14964,7 +14943,15 @@ with pkgs;

smtube = libsForQt5.callPackage ../applications/video/smtube { };

softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { };
inherit
({
softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { };
softmaker-office-nx = callPackage ../applications/office/softmaker/softmaker-office-nx.nix { };
})
softmaker-office
softmaker-office-nx
;


synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
Expand Down Expand Up @@ -15046,6 +15033,10 @@ with pkgs;
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };

okms-cli = callPackage ../by-name/ok/okms-cli/package.nix {
buildGoModule = buildGo123Module;
};

omegat = callPackage ../applications/misc/omegat.nix { };

openambit = qt5.callPackage ../applications/misc/openambit { };
Expand Down Expand Up @@ -16416,8 +16407,6 @@ with pkgs;

pycoin = with python3Packages; toPythonApplication pycoin;

solana-validator = callPackage ../applications/blockchains/solana-validator { };

snarkos = callPackage ../applications/blockchains/snarkos {
inherit (darwin.apple_sdk.frameworks) Security;
};
Expand Down Expand Up @@ -18752,7 +18741,9 @@ with pkgs;

sieveshell = with python3.pkgs; toPythonApplication managesieve;

sunshine = callPackage ../servers/sunshine { };
sunshine = callPackage ../by-name/su/sunshine/package.nix {
boost = boost185;
};

jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
# TODO: remove once `udev` is `systemdMinimal` everywhere.
Expand Down Expand Up @@ -18829,4 +18820,8 @@ with pkgs;
libpostalWithData = callPackage ../by-name/li/libpostal/package.nix {
withData = true;
};

clash-verge-rev = callPackage ../by-name/cl/clash-verge-rev/package.nix {
libsoup = libsoup_3;
};
}

0 comments on commit 5a88161

Please sign in to comment.