diff options
author | Domen Kožar <domen@dev.si> | 2014-02-18 09:10:30 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2014-02-18 09:10:30 +0100 |
commit | 810eff6087daefd6702bc4d7576a146d5890bc05 (patch) | |
tree | f7c5d3b681b2536002a0eb2455e7a1fb56032f4a /pkgs | |
parent | 0d56579b81cdfd9945e54864e3f790f9af9869d2 (diff) | |
parent | 92f9949e09163226da041865544ca9cde399fee1 (diff) | |
download | nixpkgs-810eff6087daefd6702bc4d7576a146d5890bc05.tar nixpkgs-810eff6087daefd6702bc4d7576a146d5890bc05.tar.gz nixpkgs-810eff6087daefd6702bc4d7576a146d5890bc05.tar.bz2 nixpkgs-810eff6087daefd6702bc4d7576a146d5890bc05.tar.lz nixpkgs-810eff6087daefd6702bc4d7576a146d5890bc05.tar.xz nixpkgs-810eff6087daefd6702bc4d7576a146d5890bc05.tar.zst nixpkgs-810eff6087daefd6702bc4d7576a146d5890bc05.zip |
Merge pull request #1769 from lethalman/epiphany
Epiphany: new package
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-3/core/epiphany/default.nix | 49 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-common/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 55 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix new file mode 100644 index 00000000000..7da49dbc738 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -0,0 +1,49 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu +, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool +, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, sqlite, gcr, avahi, nss, isocodes, itstool, file }: + +# TODO: icons and theme still does not work +# use packaged gnome3.gnome_icon_theme_symbolic + +stdenv.mkDerivation rec { + name = "epiphany-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz"; + sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7"; + }; + + # Tests need an X display + configureFlags = [ "--disable-static --disable-tests" ]; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ pkgconfig file ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file + webkitgtk libsoup libsecret gnome_desktop libnotify libtool + sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools + gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; + + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + + installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram "$out/bin/epiphany" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Epiphany; + description = "WebKit based web browser for GNOME"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index 5ae7ece6864..12b2510dc43 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which }: +{ stdenv, fetchurl, which, autoconf, automake }: stdenv.mkDerivation rec { name = "gnome-common-3.10.0"; @@ -13,5 +13,5 @@ stdenv.mkDerivation rec { sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; })]; - propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which } diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index bb37d2fa2da..b8832f6207a 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -20,6 +20,8 @@ rec { dconf = callPackage ./core/dconf { }; + epiphany = callPackage ./core/epiphany { }; + evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests evolution_data_server = callPackage ./core/evolution-data-server { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f781502e3d..ed811f549ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7814,6 +7814,8 @@ let epdfview = callPackage ../applications/misc/epdfview { }; + inherit (gnome3) epiphany; + espeak = callPackage ../applications/audio/espeak { }; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; |