Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add NixOS Flake by theoparis · Pull Request #247 · Redot-Engine/redot-engine · GitHub
Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add NixOS Flake by theoparis · Pull Request #247 · Redot-Engine/redot-engine · GitHub
Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add NixOS Flake by theoparis · Pull Request #247 · Redot-Engine/redot-engine · GitHub
Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add NixOS Flake by theoparis · Pull Request #247 · Redot-Engine/redot-engine · GitHub
Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add NixOS Flake by theoparis · Pull Request #247 · Redot-Engine/redot-engine · GitHub
Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add NixOS Flake by theoparis · Pull Request #247 · Redot-Engine/redot-engine · GitHub
Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add NixOS Flake by theoparis · Pull Request #247 · Redot-Engine/redot-engine · GitHub
Skip to content

Add NixOS Flake - #247

Closed
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix
Closed

Add NixOS Flake#247
theoparis wants to merge 6 commits into
Redot-Engine:masterfrom
theoparis:theoparis/nix

Conversation

@theoparis

@theoparistheoparis commented Oct 7, 2024

Copy link
Copy Markdown

Based on #154, this PR adds a nix flake.
The changes I've made compared to #154 are:

  • Signed commits
  • Added a Nix derivation
  • Added support for other systems (e.g. riscv64) via nix-systems
  • Used nixfmt (nixfmt-rfc-style package) for formatting

To Do:

  • Fix building on Darwin
  • Add runtime dependencies so you can nix build .# && ./result/bin/redot

Darwin support is still WIP which is why I made this a draft. It seems like AppKit/AppKit.h is not being found despite it being present in buildInputs.
Additionally, I had to temporarily modify platform_methods.py to allow finding moltenVK in ${darwin.moltenvk}/lib/libMoltenVK.dylib. This could probably be improved with a proper lookup of the entire sdk directory instead of looking in lib or other hard coded paths 🤔

Edit: Hmm, AppKit.h is not in an AppKit/ directory an is instead just AppKit.h via something like /nix/store/0nh8rqwsdaj9pj6lw0nkggry8ykkpazg-apple-framework-AppKit-11.0.0/Library/Frameworks/AppKit.framework/Versions/C/Headers/AppKit.h.

@Spartan322

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

@Spartan322

Copy link
Copy Markdown
Contributor

Also does this close #154?

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

@Spartan322 I have my eye on this.
#154 is mine, this is an improvement on that (so probs close #154)
its gone a bit far past my knowledge of nix shells, but a few people in the community are asking for it.
ive spoken to a few people, we will be getting back to this, a few use it already to do local builds

@MichaelFisher1997

Copy link
Copy Markdown
Contributor

Is this still being worked on, and has this been proposed to Godot?

yes, no

@Spartan322Spartan322 changed the title Add nix flakeAdd NixOS FlakeOct 31, 2024
@theoparis
theoparisforce-pushed the theoparis/nix branch 2 times, most recently from bfafb16 to 59597d0CompareDecember 5, 2024 07:38
Update the copy command in package.nix to match the output binary names.
- Added a mono build option with dotnet 9
- Added OpenGL and fixed runtime dependencies
- Migrated to nixpkgs master
@theoparis

Copy link
Copy Markdown
Author

An update on this PR:

  • I moved to nixpkgs master instead of flakehub, however if preferred I can switch to nixpkgs-unstable. Personally I think the master branch is still stable enough while receiving the latest updates from nixpkgs. Due to using flakes there is a lock file that pins a specific commit of nixpkgs.
  • I added Dotnet 9 to the package.nix file, along with a enableMono option that is currently untested. I think there are some post compilation steps that I haven't added yet for that to work. I'm also not sure if Redot supports Dotnet 9 yet.
  • I added runtimeDependencies with libGL so that OpenGL/EGL and the rest of the shared libraries can be found.

I recently installed NixOS via dual booting on my new macbook pro so I haven't really worked on Darwin support lately - I assume it's still broken.

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

Hi @theoparis ,
I am a relatively new maintainer here, and am going back through all of the old PRs.
I see there are a few PRs here related to Nix packaging. While I am somewhat familiar with what Nix is, this is not my area of expertise.
Would you mind explaining your intended use case with this to better help myself and the rest of the team better understand what the benefits of providing upstreamed package definitions?
We are looking to make a final decision regarding this trio of PRs shortly. ( #954 , #247 , #154 )

@Arctis-Fireblight

Copy link
Copy Markdown
Contributor

I think at this stage, we are going to close out this PR. If we end up moving forward with Nix packaging, it will likely be with #954

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@theoparis@Spartan322@MichaelFisher1997@Arctis-Fireblight