Skip to content
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.

Sign up for GitHub

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

Jump to bottom

mslink: fix darwin build #119228

Merged
merged 1 commit into from Jul 3, 2021
Merged

mslink: fix darwin build #119228

merged 1 commit into from Jul 3, 2021

Conversation

mkg20001
Copy link
Member

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 12, 2021
SuperSandro2000
SuperSandro2000 reviewed Apr 12, 2021
View reviewed changes
pkgs/tools/misc/mslink/default.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
'';

installPhase = ''
if [[ "$(uname)" == "Darwin" ]]; then
mv mslink.exe mslink
fi
install -D mslink $out/bin/mslink
'';

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you update the homepage to https://www.mamachine.org/mslink/index.en.html.

SuperSandro2000
SuperSandro2000 reviewed Apr 12, 2021
View reviewed changes
pkgs/tools/misc/mslink/default.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
'';

installPhase = ''
if [[ "$(uname)" == "Darwin" ]]; then
mv mslink.exe mslink
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it hurt to do this on all platforms?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it checks OS != Linux -> .exe, so this is not required there

@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 12, 2021 •
edited

Result of nixpkgs-review pr 119228 at 381f4a9 run on aarch64-linux 1

1 package built successfully:
  • mslink
1 suggestion:
  • warning: missing-phase-hooks

    installPhase should probably contain runHook preInstall and runHook postInstall.

    Near pkgs/tools/misc/mslink/default.nix:19:3:

       |
19 |   installPhase = ''
   |   ^

Result of nixpkgs-review pr 119228 at 381f4a9 run on x86_64-linux 1

1 package built successfully:
  • mslink
1 suggestion:
  • warning: missing-phase-hooks

    installPhase should probably contain runHook preInstall and runHook postInstall.

    Near pkgs/tools/misc/mslink/default.nix:19:3:

       |
19 |   installPhase = ''
   |   ^

@roberth roberth merged commit e0d0aca into NixOS:master Jul 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mkg20001 @r-rmcgibbo @SuperSandro2000 @roberth