diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-03-15 17:35:39 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-03-15 17:35:39 +0100 |
| commit | a86610144f60e8a54f12a75f2ca0ad62e2a5b7fa (patch) | |
| tree | caa105ad817423bfecfd033ba278371a91760cbf /pkgs/applications/emulators | |
| parent | c34e72182fa2a19a471014b849430b84fdedfb3d (diff) | |
| parent | 1c52b361a85d4f9e139d5b54fc21df2e1e012285 (diff) | |
Merge #219444: staging-next 2023-03-04
Diffstat (limited to 'pkgs/applications/emulators')
| -rw-r--r-- | pkgs/applications/emulators/dolphin-emu/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/emulators/vbam/default.nix | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index b9ef4682e87d9..13eec39fefbee 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -135,9 +135,6 @@ stdenv.mkDerivation rec { "--set QT_QPA_PLATFORM xcb" ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - # Use nix-provided libraries instead of submodules postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index 4f480e67ee5e2..932f8a59e7d9a 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -57,6 +57,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lassulus netali ]; homepage = "https://vba-m.com/"; platforms = lib.platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } |