Skip to content

Commit a44cbe6

Browse files
Nix: Fix metadata, cleanup
1 parent 6cbcb5f commit a44cbe6

File tree

2 files changed

+1
-33
lines changed

2 files changed

+1
-33
lines changed

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
description = "";
2+
description = "PlayStation 1 emulator and debugger";
33

44
inputs = {
55
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

pcsx-redux.nix

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
platforms,
3333
}:
3434
let
35-
# get rid of this nonsense
3635
zep = fetchFromGitHub {
3736
owner = "grumpycoders";
3837
repo = "zep";
@@ -93,35 +92,12 @@ let
9392
rev = "b1e342774cbb35467dfdd3634d4f0181a76cbc89";
9493
hash = "sha256-LYvO+chDVo6D++fuFbxqSRltGW3y82SESmtFj39TdSA=";
9594
};
96-
# commit = "faee80688fa03d924437118b28720184b7b58de1";
9795
in stdenv.mkDerivation {
9896
pname = "pcsx-redux";
9997
version = "0.99test";
10098
inherit src;
101-
/*
102-
src = fetchFromGitHub {
103-
owner = "grumpycoders";
104-
# owner = "NotExactlySiev";
105-
repo = "pcsx-redux";
106-
rev = commit;
107-
hash = "sha256-qbpeNCv7jsRBg7GOn/EAm1A2K3F/zHuMHF/bBOb9q0o=";
108-
};
109-
*/
11099

111100
postUnpack = ''
112-
# rmdir source/third_party/miniaudio
113-
# rmdir source/third_party/zep
114-
# rmdir source/third_party/nanosvg
115-
# rmdir source/third_party/nanovg
116-
# rmdir source/third_party/imgui
117-
# rmdir source/third_party/imgui_md
118-
# rmdir source/third_party/xbyak
119-
# rmdir source/third_party/luafilesystem
120-
# rmdir source/third_party/luv
121-
# rmdir source/third_party/SDL_GameControllerDB
122-
# rmdir source/third_party/tracy
123-
# rmdir source/third_party/luajit
124-
125101
cp -r ${miniaudio.out} source/third_party/miniaudio
126102
cp -r ${zep.out} source/third_party/zep
127103
cp -r ${nanosvg.out} source/third_party/nanosvg
@@ -162,12 +138,7 @@ in stdenv.mkDerivation {
162138
buildInputs = [
163139
stb
164140
ucl
165-
#imgui
166141
md4c
167-
# luajit
168-
# luajitPackages.lpeg
169-
#luajitPackages.luafilesystem
170-
#luajitPackages.lua-protobuf
171142
luajitPackages.libluv
172143
multipart-parser-c
173144
fmt
@@ -201,15 +172,12 @@ in stdenv.mkDerivation {
201172
enableDebugging = debugBuild;
202173

203174
enableParallelBuilding = true;
204-
# NIX_BUILD_CORES = 10;
205175
NIX_BUILD_CORES = 2;
206176

207177
meta = {
208178
homepage = "https://pcsx-redux.consoledev.net";
209179
description = "PlayStation 1 emulator and debugger";
210-
#license = lib.licenses.;
211180
mainProgram = "pcsx-redux";
212-
#maintainers = with lib.maintainers; [];
213181
inherit platforms;
214182
};
215183
}

0 commit comments

Comments
 (0)