wine: Enable on macOS #40641
Merged
wine: Enable on macOS #40641
+11
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
10.rebuild-darwin: 0
pkgs/misc/emulators/wine/base.nix
Outdated
| @@ -6,7 +6,8 @@ | |||
| buildScript ? null, configureFlags ? "" | |||
| }: | |||
|
|
|||
| assert stdenv.cc.cc.isGNU or false; | |||
| assert stdenv.isLinux || stdenv.isDarwin; | |||
There was a problem hiding this comment.
I think we can just remove this. The assert is only needed to prevent a potential evaluation failure below.
There was a problem hiding this comment.
yeah do meta.platforms instead.
There was a problem hiding this comment.
platform.unix + platform.windows, or all or something.
|
Great work!!! |
Ericson2314
requested changes
May 17, 2018
pkgs/misc/emulators/wine/base.nix
Outdated
| @@ -115,4 +121,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { | |||
| description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; | |||
| maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; | |||
| }; | |||
| }) | |||
| } // lib.optionalAttrs stdenv.isDarwin { | |||
| hardeningDisable = [ "fortify" ]; | |||
There was a problem hiding this comment.
hardeningDisable can go up above with a lib.optional. This isn't a mass rebuild, right?
pkgs/misc/emulators/wine/base.nix
Outdated
| @@ -6,7 +6,8 @@ | |||
| buildScript ? null, configureFlags ? "" | |||
| }: | |||
|
|
|||
| assert stdenv.cc.cc.isGNU or false; | |||
| assert stdenv.isLinux || stdenv.isDarwin; | |||
There was a problem hiding this comment.
yeah do meta.platforms instead.
pkgs/misc/emulators/wine/base.nix
Outdated
| @@ -6,7 +6,8 @@ | |||
| buildScript ? null, configureFlags ? "" | |||
| }: | |||
|
|
|||
| assert stdenv.cc.cc.isGNU or false; | |||
| assert stdenv.isLinux || stdenv.isDarwin; | |||
There was a problem hiding this comment.
platform.unix + platform.windows, or all or something.
veprbl
reviewed
May 18, 2018
pkgs/misc/emulators/wine/base.nix
Outdated
| @@ -16,6 +15,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { | |||
| }) // rec { | |||
| inherit name src configureFlags; | |||
|
|
|||
| hardeningDisable = [ "fortify" ]; | |||
There was a problem hiding this comment.
hardeningDisable = lib.optional stdenv.isDarwin "fortify";
Ericson2314
force-pushed
the
feature/darwin-wine
branch
from
383d40f to
efeed44
Compare
Ericson2314
force-pushed
the
feature/darwin-wine
branch
from
efeed44 to
0828bc5
Compare
|
I fixed the remaining issues. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)