luakit: migrate to by-name (#348289) (1bbd47ee) · Commits · nix / nixpkgs

pkgs/applications/networking/browsers/luakit/default.nix→pkgs/by-name/lu/luakit/package.nix

+56 −46

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, pkg-config
		, wrapGAppsHook3
		, help2man
		, glib-networking
		, gst_all_1
		, gtk3
		, luafilesystem
		, luajit
		, sqlite
		, webkitgtk_4_0
		{
		lib,
		fetchFromGitHub,
		glib-networking,
		gst_all_1,
		gtk3,
		help2man,
		luajit,
		luajitPackages,
		pkg-config,
		sqlite,
		stdenv,
		webkitgtk_4_0,
		wrapGAppsHook3,
		}:

		stdenv.mkDerivation rec {
		let
		inherit (luajitPackages) luafilesystem;
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "luakit";
		version = "2.3.3";

		src = fetchFromGitHub {
		owner = "luakit";
		repo = pname;
		rev = version;
		repo = "luakit";
		rev = finalAttrs.version;
		hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo=";
		};

		nativeBuildInputs = [
		luajit
		pkg-config
		help2man
		wrapGAppsHook3
		];
		buildInputs = [
		gtk3

		buildInputs =
		[
		glib-networking # TLS support
		gtk3
		luafilesystem
		luajit
		sqlite
		webkitgtk_4_0
		] ++ ( with gst_all_1; [
		gstreamer
		]
		++ (with gst_all_1; [
		gst-libav
		gst-plugins-bad
		gst-plugins-base
		gst-plugins-good
		gst-plugins-bad
		gst-plugins-ugly
		gst-libav
		gstreamer
		]);

		strictDeps = true;

		# build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
		# TODO: why is not this the default? The test runner adds
		@@ -63,9 +71,11 @@ stdenv.mkDerivation rec {
		"XDGPREFIX=${placeholder "out"}/etc/xdg"
		];

		preFixup = let
		preFixup =
		let
		luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
		in ''
		in
		''
		gappsWrapperArgs+=(
		--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
		--prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
		@@ -73,10 +83,9 @@ stdenv.mkDerivation rec {
		)
		'';

		meta = with lib; {
		meta = {
		homepage = "https://luakit.github.io/";
		description = "Fast, small, webkit-based browser framework extensible in Lua";
		mainProgram = "luakit";
		longDescription = ''
		Luakit is a highly configurable browser framework based on the WebKit web
		content engine and the GTK+ toolkit. It is very fast, extensible with Lua,
		@@ -84,8 +93,9 @@ stdenv.mkDerivation rec {
		power users, developers and anyone who wants to have fine-grained control
		over their web browser’s behaviour and interface.
		'';
		license = licenses.gpl3Only;
		maintainers = [ maintainers.AndersonTorres ];
		platforms = platforms.unix;
		license = lib.licenses.gpl3Only;
		mainProgram = "luakit";
		maintainers = with lib.maintainers; [ AndersonTorres ];
		platforms = lib.platforms.unix;
		};
		}
		})

pkgs/top-level/all-packages.nix

+0 −4

Original line number	Diff line number	Diff line
		@@ -30767,10 +30767,6 @@ with pkgs;

		lime = callPackage ../development/libraries/lime { };

		luakit = callPackage ../applications/networking/browsers/luakit {
		inherit (luajitPackages) luafilesystem;
		};

		looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };

		ltc-tools = callPackage ../applications/audio/ltc-tools { };