WIP: Windows support -- depends on Meson build system (#3160) #3185
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
(cherry picked from commit ec49ea2)
Dead code since NixOS/nixpkgs@6669a3b (cherry picked from commit 2894197)
(cherry picked from commit 64d7d1a)
This reduces the size of the closure by 45 MiB. (cherry picked from commit 145db70)
(cherry picked from commit 5e83b02)
(cherry picked from commit 4143977)
The profile present in PATH is not necessarily the actual profile location. User profiles are generally added as $HOME/.nix-profile in which case the indirect profile link needs to be resolved first. /home/user/.nix-profile -> /nix/var/nix/profiles/per-user/user/profile /nix/var/nix/profiles/per-user/user/profile -> profile-15-link /nix/var/nix/profiles/per-user/user/profile-14-link -> /nix/store/hyi4kkjh3bwi2z3wfljrkfymz9904h62-user-environment /nix/var/nix/profiles/per-user/user/profile-15-link -> /nix/store/6njpl3qvihz46vj911pwx7hfcvwhifl9-user-environment To upgrade nix here we want /nix/var/nix/profiles/per-user/user/profile-16-link instead of /home/user/.nix-profile-1-link. The latter is not a gcroot and would be garbage collected, resulting in a broken profile. Fixes NixOS#2175 (cherry picked from commit d85bb48)
(cherry picked from commit 0767e40)
(cherry picked from commit 264e66f)
E.g. $ nix upgrade-nix error: directory '/home/eelco/Dev/nix/inst/bin' does not appear to be part of a Nix profile instead of $ nix upgrade-nix error: '/home/eelco/Dev/nix/inst' is not a symlink (cherry picked from commit f08b14c)
…-user/... Also some cosmetic improvements. (cherry picked from commit 39f1722)
shell.nix defines the install prefix as $(pwd)/inst (cherry picked from commit 8ad2def)
(cherry picked from commit 81d1385)
(cherry picked from commit 10ebcf8)
Maybe there is a better place to document this, which is more generic? (cherry picked from commit 33712fe)
(cherry picked from commit 2df21b7)
(cherry picked from commit 149d10c)
(cherry picked from commit 4095cd6)
Fixes NixOS#2390. (cherry picked from commit b7409c5)
This is already done by coerceToString(), provided that the argument is a path (e.g. 'fetchGit ./bla'). It fixes the handling of URLs like [email protected]:owner/repo.git. It breaks 'fetchGit "./bla"', but that was never intended to work anyway and is inconsistent with other builtin functions (e.g. 'readFile "./bla"' fails). (cherry picked from commit 475a0a5)
(cherry picked from commit 0b7568f)
(cherry picked from commit b7bb627)
(cherry picked from commit 8770253)
(cherry picked from commit f66fa7c)
Use sh <(...) syntax for installation to preserve stdin and prompting also update installation docs to account for changes in multi-user selection (cherry picked from commit c3e508d)
(cherry picked from commit 51f9682)
…t selected for Linux with systemd, and the bug about selinux (cherry picked from commit 4be7652)
(cherry picked from commit c42eaaf)
|
@volth What did you get for libbacktrace with MinGW, https://github.com/cloudwu/backtrace-mingw? that is the one thing I see, but no pkg-config file so doesn't really match what you wrote. |
This is needed when cross compiling, and good practice in native builds too to ensure developers don't accidentally use newer stuff.
This partially reverts commit 986f28a.
I'll try to fix this upstream so we can revert this commit.
Ensure no linux regressions!
Needs the gccpp lib, which the pkg-config file doesn't mention.
|
In other news, it builds!! Will push very shortly. NixOS/nixpkgs#73265 is the real secret sauce. |
Meson should get mesonbuild/meson#106 fixed so that we don't have to manually propogate the public dep.
|
OK build instructions
Of course, I hope to automate all of this away. |
Meson works fine with MinGW, and will work fine with MSVC, if only I could finish building all the deps to prove it.
|
nice work :) |
10 tasks
|
Yes, that's a good idea. Also, I think I should close this one until something more up to date is ready :). |
is this in regards to the meson port? are you waiting for it to be brought up to latest ? |
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.
Credits to @volth and @p01arst0rm for doing the real work. I just fixed some merge conflicts, fixed linux regressions, and unified the build systems. [Will delete @volth's temporary build system once I can get things building with https://github.com/NixOS/nixpkgs/pull/72366.]
The history is....wild, but if someone want's that fixed, I don't think it's worth fixing until this is closer to being ready.