mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
eolie: fix build
This commit is contained in:
parent
79092439ca
commit
fefbcbc550
2 changed files with 8 additions and 32 deletions
|
@ -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
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ 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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
|||
version = "0.9.16";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.gnome.org/gnumdk/eolie";
|
||||
url = https://gitlab.gnome.org/gnumdk/eolie;
|
||||
rev = version;
|
||||
sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
|
||||
};
|
||||
|
@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkgconfig
|
||||
wrapGAppsHook
|
||||
gobjectIntrospection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
git # required to download ad blocking DB
|
||||
glib
|
||||
glib-networking
|
||||
gsettings-desktop-schemas
|
||||
gst_all_1.gstreamer
|
||||
|
@ -47,20 +48,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
wrapPrefixVariables = [ "PYTHONPATH" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001-Remove-post-install-script-handle-in-nix-config-inst.patch
|
||||
./0001-Extend-the-python-path-rather-than-replacing-it.patch
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A new GNOME web browser";
|
||||
homepage = https://gitlab.gnome.org/gnumdk/eolie;
|
||||
homepage = https://wiki.gnome.org/Apps/Eolie;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.samdroid-apps ];
|
||||
platforms = platforms.linux;
|
||||
|
|
Loading…
Reference in a new issue