next: Fix #74258 #74265
next: Fix #74258 #74265
Conversation
Next had a few issues with its packaging: * the platform port was exposed in all-packages And this is not useful for outside users. It's now a local attribute in the next package. * the platform port wasn't wrapped correctly It appears that the lisp core was being wrapped, when instead the actual gtk application that's called within the lisp core had to be wrapped. * codestyle/indentation
worldofpeace
force-pushed
the
next-fix
branch
from
dd35e24
to
417d635
Compare
|
In a pure nix-shell I see the following in the logs when visiting As this has been reported upstream, I'm going to assume it's a bug |
|
if it's an upstream issue, then I'm fine with the change :) |
|
Just note I exposed the @worldofpeace Are you using a formatting tool? Otherwise, I locally tested this PR which works well! |
Yeah, |
I'm not sure why it has be separate, and not like all-in-one in the build with some sort of flag. |
| ]; | ||
|
|
||
| makeFlags = [ | ||
| "gtk-webkit" |
There was a problem hiding this comment.
This should be in buildFlags.
|
I tried diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix
index 97c65fc12ef..6cc5316c098 100644
--- a/pkgs/applications/networking/browsers/next/default.nix
+++ b/pkgs/applications/networking/browsers/next/default.nix
@@ -3,6 +3,8 @@
, lispPackages
, sbcl
, callPackage
+, libfixposix
+, xclip
}:
let
@@ -59,6 +61,7 @@ stdenv.mkDerivation rec {
trivia
trivial-clipboard
unix-opts
+ quicklisp
];
prePatch = ''
@@ -66,16 +69,23 @@ stdenv.mkDerivation rec {
--replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"
'';
- buildPhase = ''
- common-lisp.sh --eval "(require :asdf)" \
- --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \
- --eval '(asdf:make :next)' \
- --quit
+ preConfigure = ''
+ export HOME=$TMPDIR
'';
- installPhase = ''
- install -D -m0755 next $out/bin/next
- '';
+ makeFlags = [
+ "PREFIX=${placeholder ''out''}"
+ "NEXT_INTERNAL_QUICKLISP=false"
+ ];
+
+ buildFlags = [
+ "next"
+ ];
+
+ installTargets = [
+ "install-next"
+ "install-assets"
+ ];
# Stripping destroys the generated SBCL image
dontStrip = true;to see if it fixes #76838 but it failed with |
Commit message
Next had a few issues with its packaging:
the platform port was exposed in all-packages
And this is not useful for outside users.
It's now a local attribute in the next package.
the platform port wasn't wrapped correctly
It appears that the lisp core was being wrapped,
when instead the actual gtk application that's
called within the lisp core had to be wrapped.
codestyle/indentation
Description of change
This is meant to fix #74258.
According to the Next documentation at https://github.com/atlas-engineer/next/tree/master/ports#next-platform-ports, the only part of Next that needs to be treated like a gtk app is the webkitgtk platform port.
To fix this issue we just wrapped this program like any other gtk app, as pre the documentation
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)