Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c74e20bb209
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aaca9c00f6ae
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 24, 2019

  1. luakit: clean up

    @jtojnar
    jtojnar committed Feb 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1d39e83 View commit details

  2. luakit: 2017.08.10 → 2.1

    @jtojnar
    jtojnar committed Feb 24, 2019
    Copy the full SHA
    2578eca View commit details

Commits on Mar 2, 2019

  1. Merge pull request #56292 from jtojnar/luakit 

    luakit: 2017.08.10 → 2.1
    @jtojnar
    jtojnar authored Mar 2, 2019
    Copy the full SHA
    aaca9c0 View commit details
Showing with 31 additions and 25 deletions.
  1. +31 −25 pkgs/applications/networking/browsers/luakit/default.nix
56 changes: 31 additions & 25 deletions pkgs/applications/networking/browsers/luakit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper
,help2man, lua5, luafilesystem, luajit, sqlite
,webkitgtk, gtk3, gst_all_1, glib-networking}:
{ stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook
, help2man, lua5, luafilesystem, luajit, sqlite
, webkitgtk, gtk3, gst_all_1, glib-networking
}:

let
lualibs = [luafilesystem];
@@ -11,51 +12,56 @@ let
luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs);

in stdenv.mkDerivation rec {
pname = "luakit";
version = "2.1";

name = "luakit-${version}";
version = "2017.08.10";
src = fetchFromGitHub {
owner = "luakit";
repo = "luakit";
rev = "${version}";
sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r";
rev = version;
sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa";
};

nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper];
nativeBuildInputs = [
pkgconfig help2man wrapGAppsHook
];

buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3
buildInputs = [
webkitgtk lua5 luafilesystem luajit sqlite gtk3
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
glib-networking # TLS support
];

postPatch =
#Kind of ugly seds here. There must be a better solution.
''
patchShebangs ./build-utils
sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua;
sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua;
sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua;
preBuild = ''
# build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
# TODO: why is not this the default?
LUA_PATH=?.lua
'';

buildPhase = ''
make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1
'';
makeFlags = [
"DEVELOPMENT_PATHS=0"
"USE_LUAJIT=1"
"INSTALLDIR=${placeholder "out"}"
"PREFIX=${placeholder "out"}"
"USE_GTK3=1"
"XDGPREFIX=${placeholder "out"}/etc/xdg"
];

installPhase = let
preFixup = let
luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
in ''
make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install
wrapProgram $out/bin/luakit \
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \
--set LUA_PATH '${luaKitPath};${luaPath};' \
gappsWrapperArgs+=(
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
--set LUA_PATH '${luaKitPath};${luaPath};'
--set LUA_CPATH '${luaCPath};'
)
'';

meta = with stdenv.lib; {
description = "Fast, small, webkit based browser framework extensible in Lua";
homepage = "http://luakit.org";
homepage = http://luakit.org;
license = licenses.gpl3;
platforms = platforms.linux; # Only tested linux
};