From 6c76bc2949a5ffa4d9c274ce26005ee235e2c878 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 24 Oct 2020 20:31:59 +0200 Subject: [PATCH] lispPackages.cl-webkit2: init --- .../quicklisp-to-nix-output/cl-webkit2.nix | 43 +++++++++++++++++++ .../quicklisp-to-nix-overrides.nix | 1 + .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 24 +++++++++++ pkgs/development/lisp-modules/shell.nix | 2 +- 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix new file mode 100644 index 000000000000..01a2732a7ecc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix @@ -0,0 +1,43 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-webkit2''; + version = ''cl-webkit-20201016-git''; + + description = ''An FFI binding to WebKit2GTK+''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz''; + sha256 = ''15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh''; + }; + + packageName = "cl-webkit2"; + + asdFilesToKeep = ["cl-webkit2.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-webkit2 DESCRIPTION An FFI binding to WebKit2GTK+ SHA256 + 15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh URL + http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz + MD5 d7b482185cf5a403d5211626560d2f66 NAME cl-webkit2 FILENAME cl-webkit2 + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME cl-cffi-gtk FILENAME cl-cffi-gtk) + (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) + (NAME cl-cffi-gtk-gdk FILENAME cl-cffi-gtk-gdk) + (NAME cl-cffi-gtk-gdk-pixbuf FILENAME cl-cffi-gtk-gdk-pixbuf) + (NAME cl-cffi-gtk-gio FILENAME cl-cffi-gtk-gio) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) + (NAME cl-cffi-gtk-pango FILENAME cl-cffi-gtk-pango) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk cl-cffi-gtk-cairo + cl-cffi-gtk-gdk cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features + trivial-garbage) + VERSION cl-webkit-20201016-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 1b53778a233e..7e44999e58cd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -233,4 +233,5 @@ $out/lib/common-lisp/query-fs" cl-cffi-gtk-pango = addNativeLibs [pkgs.pango]; cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3]; cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3]; + cl-webkit2 = addNativeLibs [pkgs.webkitgtk]; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 7c7ecef3703c..c755863a0692 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -155,3 +155,4 @@ trivial-package-local-nicknames cl-cffi-gtk enchant trivial-main-thread +cl-webkit2 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 8d482cb158a6..5ce356bebf0e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -1394,6 +1394,30 @@ let quicklisp-to-nix-packages = rec { })); + "cl-webkit2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-webkit2" or (x: {})) + (import ./quicklisp-to-nix-output/cl-webkit2.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk" = quicklisp-to-nix-packages."cl-cffi-gtk"; + "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo"; + "cl-cffi-gtk-gdk" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk"; + "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf"; + "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject"; + "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + "trivial-main-thread" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-main-thread" or (x: {})) diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index 6db214d633a8..0201491f4cca 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -11,6 +11,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib"; }; in stdenv.mkDerivation self