nyxt: fix after major changes to lisp-modules
This commit is contained in:
parent
e141ed8312
commit
03ef1b250a
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue