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
erlangR19: 19.1.6 -> 19.2 #21775
erlangR19: 19.1.6 -> 19.2 #21775
Conversation
a990bd9
to
927cb1b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On NixOS
@@ -45,6 +45,8 @@ stdenv.mkDerivation rec { | |||
|
|||
preConfigure = '' | |||
./otp_build autoconf | |||
'' + optionalString stdenv.isDarwin '' | |||
substituteInPlace configure --replace "sw_vers" "/usr/bin/sw_vers" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@LnL7 LGTY?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So for me, running the "sw_vers" command without the prepended "/usr/bin/" works perfectly alright. I want to see if NixOS contains this already
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@grahamc I see it done here
substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes it's darwin specific, what's this used for? If you can replace the call to the binary with a string would be a better approach.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@LnL7 it's used to obtain specific Mac OS version info
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just checked our stdenv sets MACOSX_DEPLOYMENT_TARGET
to 10.10
, that's probably what we want to use.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm hacking nix-darwin atm, but I'll give that a go after.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, please.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rebased and squashed!
Hey, @DerTim1! I appreciate the reviews you've been doing, thank you and keep up the good work! This change LGTM but just want to get a darwin person (like LnL ) to look at the change. Can you explain what that substitute does? |
@grahamc No problem. I thought a build von a linux-system is always useful. :) |
@DerTim1 Definitely! Donating some cpu cycles is always appreciated. |
5bb4d2b
to
0c4eb07
Compare
Rebased. |
Include sw_vers patch as discussed on NixOS#21775.
0c4eb07
to
ad3e589
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good now, it's building but it might be some time before I can check the results.
Motivation for this change
Update
erlangR19
from 19.1.6 to 19.2.N.B. I've added a
sw_vers
substitution fordarwin
.Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)