eolie: fix build

This commit is contained in:
Jan Tojnar 2018-03-21 22:58:31 +01:00
parent 79092439ca
commit fefbcbc550
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 8 additions and 32 deletions

View File

@ -1,23 +0,0 @@
From a79d2dcd1b6275904193454fb9d68614813929f3 Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Mon, 27 Nov 2017 11:17:35 +1100
Subject: [PATCH] Remove post install script - handle in nix config instead
---
meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/meson.build b/meson.build
index fc45296..2227f1f 100644
--- a/meson.build
+++ b/meson.build
@@ -53,5 +53,3 @@ configure_file(
configuration: conf,
install_dir: bindir
)
-
-meson.add_install_script('meson_post_install.py')
--
2.15.0

View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
, git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3 , glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection
, gtkspell3, libsecret, python36, python36Packages, webkitgtk }: , gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.9.16"; version = "0.9.16";
src = fetchgit { src = fetchgit {
url = "https://gitlab.gnome.org/gnumdk/eolie"; url = https://gitlab.gnome.org/gnumdk/eolie;
rev = version; rev = version;
sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b"; sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
}; };
@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
ninja ninja
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
gobjectIntrospection
]; ];
buildInputs = [ buildInputs = [
git # required to download ad blocking DB glib
glib-networking glib-networking
gsettings-desktop-schemas gsettings-desktop-schemas
gst_all_1.gstreamer gst_all_1.gstreamer
@ -47,20 +48,18 @@ stdenv.mkDerivation rec {
wrapPrefixVariables = [ "PYTHONPATH" ]; wrapPrefixVariables = [ "PYTHONPATH" ];
enableParallelBuilding = true; postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
postInstall = '' patchShebangs meson_post_install.py
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
''; '';
patches = [ patches = [
./0001-Remove-post-install-script-handle-in-nix-config-inst.patch
./0001-Extend-the-python-path-rather-than-replacing-it.patch ./0001-Extend-the-python-path-rather-than-replacing-it.patch
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A new GNOME web browser"; description = "A new GNOME web browser";
homepage = https://gitlab.gnome.org/gnumdk/eolie; homepage = https://wiki.gnome.org/Apps/Eolie;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.samdroid-apps ]; maintainers = [ maintainers.samdroid-apps ];
platforms = platforms.linux; platforms = platforms.linux;