public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '2e56ba' from staging into master

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2018-01-17 12:50:46 +02:00
parent 5ab499d2c7 2e56ba6fbd
commit 67c73b4e64
97 changed files with 231 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/desktops/gnome-3/apps/bijiben/default.nix
View File

@@ -8,7 +8,6 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
checkPhase = "meson test";
patches = [
./no-update-icon-cache.patch

2
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
View File

@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
prePatch = "patchShebangs build-aux/";
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Clocks;
description = "Clock application designed for GNOME 3";

6
pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
View File

@@ -1,6 +1,4 @@
{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib
, gettext, gobjectIntrospection
}:
{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
stdenv.mkDerivation rec {
name = "nautilus-sendto-${version}";
@@ -12,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
};
nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
buildInputs = [ glib ];
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
View File

@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43];
buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ];
checkPhase = "meson test";
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Dictionary;
description = "Dictionary is the GNOME application to look up definitions";

2
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
View File

@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ];

8
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
View File

@@ -1,15 +1,12 @@
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3
, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib
, gnome3, librsvg, gdk_pixbuf, gobjectIntrospection }:
, gnome3, librsvg, gdk_pixbuf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
doCheck = true;
checkPhase = "meson test";
postPatch = ''
chmod +x build-aux/postinstall.py # patchShebangs requires executable file
patchShebangs build-aux/postinstall.py
@@ -18,8 +15,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2
wrapGAppsHook gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ];
buildInputs = [ bash gtk3 glib libcanberra_gtk3
gnome3.gsettings_desktop_schemas ];

2
pkgs/desktops/gnome-3/core/libgepub/default.nix
View File

@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ];

2
pkgs/desktops/gnome-3/core/simple-scan/default.nix
View File

@@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "meson test";
meta = with stdenv.lib; {
description = "Simple scanning utility";
longDescription = ''

2
pkgs/desktops/gnome-3/core/totem/default.nix
View File

@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
checkPhase = "meson test";
patches = [
(fetchurl {
name = "remove-pycompile.patch";