-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
devilutionx: unstable-2019-07-28 -> 0.5.0 #70971
Conversation
1a163a9
to
a8677b2
Compare
@GrahamcOfBorg build devilutionx |
@karolchmist are you able to address the |
No, I don't see why it failed... Seems like it compiles, and then fails in install phase. I don't have macOs. What can we do? Maybe remove darwin from the platform list? |
Seems like a differently named executable is produced on |
@aanderse I pushed a commit that lists the content of the output folder. On darwin, it's :
It seems like Do you know what we should do in this case? |
@karolchmist unfortunately I've never really used ping @lilyball as someone who might be generous and share basic |
Maybe @jsamsa wouldn't mind taking 30 seconds to explain an extremely basic |
mv devilutionx.app $out/Applications |
There might be a binary that could (should) be moved to $out/bin as well. I'm not familiar with this package so, not sure myself. Have a look at |
2fd8948
to
54ab509
Compare
Thanks for your help @aanderse and @jsamsa . I tried to make sense of how to build it on Darwin, but I gave up because I wasn't sure what I was doing. Even if it builds, I can't test it properly. If one day someone is willing to make it work, I'd be happy to help. Until then, I prefer to remove the support for Darwin. It's a niche game, and I don't think anybody cares... To finish on a positive note: I re-enabled the hardening for the |
@karolchmist alright. Too bad, but we don't have the hardware so if someone wants Can you please format your commit messages as per nixpkgs standard? As in:
Or squash all commits into:
Thanks! |
@jsamsa's suggestion looks correct. The output as listed in your comment is |
I don't have Here's the diff applied to get to this point: diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 63149aff678..650d12c112b 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -17,10 +17,13 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
-
+ '' + (if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ mv devilutionx.app $out/Applications
+ '' else ''
mkdir -p $out/bin
cp devilutionx $out/bin
-
+ '') + ''
runHook postInstall
'';
@@ -29,6 +32,6 @@ stdenv.mkDerivation rec {
description = "Diablo build for modern operating systems";
license = licenses.unlicense;
maintainers = [ maintainers.karolchmist ];
- platforms = platforms.linux ++ platforms.windows;
+ platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
};
} |
Thank you for your detailed explanation @lilyball! You are exceptional, as always! Generally how these open source forks/remakes of proprietary games work is that they ask you to put the game data in a predefined location like @karolchmist at this point @lilyball has handed us the solution... If you don't mind can you please keep |
My question with diabdat.mpq is because the instructions say
That makes it sound like it's supposed to be sitting next to the executable, which obviously doesn't work with Nix (for any platform). That said, after digging through all of the code it does appear that if it can't find the file next to the executable it falls back to |
54ab509
to
ac011ef
Compare
Hey @lilyball, thanks for you help! I pushed a version with your solution for Darwin. How would you document the location for |
561dc9b
to
88edb8f
Compare
|
88edb8f
to
334c821
Compare
@GrahamcOfBorg build devilutionx |
@karolchmist small suggestion on wording. Looking good. Thanks again @lilyball 🎉 |
Co-Authored-By: Aaron Andersen <aaron@fosslib.net>
devilutionx: unstable-2019-07-28 -> 0.5.0
devilutionx: unstable-2019-07-28 -> 0.5.0 (cherry picked from commit 47f47b4)
Motivation for this change
DevilutionX 0.5.0 release:
https://github.com/diasurgical/devilutionX/releases/tag/0.5.0
Based on Devilution 0.10.0
Features
Known issues
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @karolchmist (myself :P )