diff options
| author | Kasper Gałkowski <k@galkowski.xyz> | 2023-03-01 21:56:51 +0100 |
|---|---|---|
| committer | Kasper Gałkowski <k@galkowski.xyz> | 2023-03-02 19:04:47 +0100 |
| commit | 03ef1b250a95abb505a07281c9e52643aa720942 (patch) | |
| tree | 0a8a6971c663ed3d736abcf8d7ee1b505478585a | |
| parent | e141ed831269e5670a6114c6d9878fe9b8f8e153 (diff) | |
nyxt: fix after major changes to lisp-modules
| -rw-r--r-- | pkgs/applications/networking/browsers/nyxt/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/lisp-modules/packages.nix | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 7c1cb7f04a71f..3e526bf203349 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, lispPackages +{ stdenv, lib, sbclPackages , makeWrapper, wrapGAppsHook, gst_all_1 , glib, gdk-pixbuf, cairo , mailcap, pango, gtk3 @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { pname = "nyxt"; - inherit (lispPackages.nyxt.meta) version; + inherit (sbclPackages.nyxt) version; - src = lispPackages.nyxt; + src = sbclPackages.nyxt; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; gstBuildInputs = with gst_all_1; [ @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { dontWrapGApps = true; installPhase = '' mkdir -p $out/share/applications/ - sed "s/VERSION/$version/" $src/lib/common-lisp/nyxt/assets/nyxt.desktop > $out/share/applications/nyxt.desktop + sed "s/VERSION/$version/" $src/assets/nyxt.desktop > $out/share/applications/nyxt.desktop for i in 16 32 128 256 512; do mkdir -p "$out/share/icons/hicolor/''${i}x''${i}/apps/" - cp -f $src/lib/common-lisp/nyxt/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png" + cp -f $src/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png" done mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \ diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index d3e85628a84e8..72bdffba40d61 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -285,7 +285,7 @@ let ]; buildScript = pkgs.writeText "build-nyxt.lisp" '' - (load "${spec.asdf}") + (load "${super.nyxt.asdfFasl}/asdf.${super.nyxt.faslExt}") (asdf:load-system :nyxt/gtk-application) (sb-ext:save-lisp-and-die "nyxt" :executable t #+sb-core-compression :compression @@ -301,6 +301,7 @@ let mkdir -p $out/bin cp -v nyxt $out/bin wrapProgram $out/bin/nyxt \ + --set WEBKIT_FORCE_SANDBOX 0 \ --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH \ --prefix XDG_DATA_DIRS : $XDG_ICON_DIRS \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ |