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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-12-03 12:13:20 +01:00
commit 077b7e5880
488 changed files with 2679 additions and 2391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/no-x-libs.nix
View File

@ -35,7 +35,7 @@ with lib;
networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
pinentry = super.pinentry_ncurses; pinentry = super.pinentry_ncurses;
gobjectIntrospection = super.gobjectIntrospection.override { x11Support = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; };
})); }));
}; };
} }

1
nixos/modules/module-list.nix
View File

@ -246,6 +246,7 @@
./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-documents.nix
./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix ./services/desktops/gnome3/gnome-online-accounts.nix
./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-online-miners.nix ./services/desktops/gnome3/gnome-online-miners.nix
./services/desktops/gnome3/gnome-terminal-server.nix ./services/desktops/gnome3/gnome-terminal-server.nix
./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/gnome-user-share.nix

18
nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix Normal file
View File

@ -0,0 +1,18 @@
# Remote desktop daemon using Pipewire.
{ config, lib, pkgs, ... }:
with lib;
{
###### interface
options = {
services.gnome3.gnome-remote-desktop = {
enable = mkEnableOption "Remote Desktop support using Pipewire";
};
};
###### implementation
config = mkIf config.services.gnome3.gnome-remote-desktop.enable {
systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ];
};
}

1
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -107,6 +107,7 @@ in {
services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-documents.enable = mkDefault true;
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = mkDefault true; services.gnome3.gnome-online-accounts.enable = mkDefault true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-terminal-server.enable = mkDefault true; services.gnome3.gnome-terminal-server.enable = mkDefault true;
services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome3.gnome-user-share.enable = mkDefault true;
services.gnome3.gvfs.enable = true; services.gnome3.gvfs.enable = true;

2
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -116,7 +116,7 @@ in
environment = { environment = {
GDM_X_SERVER_EXTRA_ARGS = toString GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs); (filter (arg: arg != "-terminate") cfg.xserverArgs);
GDM_SESSIONS_DIR = "${cfg.session.desktops}/share/xsessions"; XDG_DATA_DIRS = "${cfg.session.desktops}/share/";
# Find the mouse # Find the mouse
XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons"; XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
} // optionalAttrs (xSessionWrapper != null) { } // optionalAttrs (xSessionWrapper != null) {

8
pkgs/applications/audio/cozy-audiobooks/default.nix
View File

@ -8,7 +8,7 @@
, desktop-file-utils , desktop-file-utils
, gtk3 , gtk3
, gst_all_1 , gst_all_1
, gobjectIntrospection , gobject-introspection
, python3Packages , python3Packages
, file , file
, cairo , cairo
@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
wrapGAppsHook wrapGAppsHook
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
gobjectIntrospection gobject-introspection
]; ];
buildInputs = [ buildInputs = [
@ -66,10 +66,6 @@ python3Packages.buildPythonApplication rec {
substituteInPlace cozy/magic/magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" substituteInPlace cozy/magic/magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
''; '';
checkPhase = ''
ninja test
'';
postInstall = '' postInstall = ''
ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy
''; '';

44
pkgs/applications/audio/gnome-podcasts/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
# TODO: build from git for easier updates
# rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec {
version = "0.4.6";
name = "gnome-podcasts-${version}";
src = fetchurl {
url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc";
};
# src = fetchFromGitLab {
# domain = "gitlab.gnome.org";
# owner = "World";
# repo = "podcasts";
# rev = version;
# sha256 = "15xj98dhxvys0cnya9488qsfsm0ys1wy69wkc39z8j6hwdm7byq2";
# };
nativeBuildInputs = [
meson ninja pkgconfig gettext cargo rustc python3 wrapGAppsHook
];
buildInputs = [
glib gtk3 libhandy dbus openssl sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad
];
# cargoSha256 = "0721b5f700vvvzvmdl8nfjaa6j412q1fjssgrjv8n6rmn9z13d2v";
postPatch = ''
chmod +x scripts/compile-gschema.py # patchShebangs requires executable file
patchShebangs scripts/compile-gschema.py
'';
meta = with stdenv.lib; {
description = "Listen to your favorite podcasts";
homepage = https://wiki.gnome.org/Apps/Podcasts;
license = licenses.gpl3;
maintainers = gnome3.maintainers;
platforms = platforms.unix;
};
}

4
pkgs/applications/audio/gpodder/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3, python3Packages, intltool { stdenv, fetchFromGitHub, python3, python3Packages, intltool
, glibcLocales, gnome3, gtk3, wrapGAppsHook , glibcLocales, gnome3, gtk3, wrapGAppsHook
, ipodSupport ? false, libgpod, gobjectIntrospection , ipodSupport ? false, libgpod, gobject-introspection
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
python3 python3
gobjectIntrospection gobject-introspection
gnome3.defaultIconTheme gnome3.defaultIconTheme
]; ];

4
pkgs/applications/audio/lollypop/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, meson, ninja, pkgconfig { stdenv, fetchgit, meson, ninja, pkgconfig
, python3, gtk3, gst_all_1, libsecret, libsoup , python3, gtk3, gst_all_1, libsecret, libsoup
, appstream-glib, desktop-file-utils, gnome3 , appstream-glib, desktop-file-utils, gnome3
, gobjectIntrospection, wrapGAppsHook }: , gobject-introspection, wrapGAppsHook }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
version = "0.9.611"; version = "0.9.611";
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
gobjectIntrospection gobject-introspection
meson meson
ninja ninja
pkgconfig pkgconfig

4
pkgs/applications/audio/mopidy/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
, gst_all_1, glib-networking, gobjectIntrospection , gst_all_1, glib-networking, gobject-introspection
}: }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = with gst_all_1; [ buildInputs = with gst_all_1; [
gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
glib-networking gobjectIntrospection glib-networking gobject-introspection
]; ];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [

4
pkgs/applications/audio/mopidy/local-images.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: { stdenv, fetchFromGitHub, pythonPackages, mopidy, gobject-introspection }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "mopidy-local-images"; pname = "mopidy-local-images";
@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d";
}; };
buildInputs = [ gobjectIntrospection ]; buildInputs = [ gobject-introspection ];
checkInputs = [ checkInputs = [
pythonPackages.mock pythonPackages.mock

4
pkgs/applications/audio/pithos/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify { fetchFromGitHub, stdenv, pythonPackages, gtk3, gobject-introspection, libnotify
, gst_all_1, wrapGAppsHook }: , gst_all_1, wrapGAppsHook }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [ wrapGAppsHook ]; buildInputs = [ wrapGAppsHook ];
propagatedBuildInputs = propagatedBuildInputs =
[ gtk3 gobjectIntrospection libnotify ] ++ [ gtk3 gobject-introspection libnotify ] ++
(with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++
(with pythonPackages; [ pygobject3 pylast ]); (with pythonPackages; [ pygobject3 pylast ]);

4
pkgs/applications/audio/quodlibet/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf, { stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobjectIntrospection, tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
gst_all_1, withGstPlugins ? true, gst_all_1, withGstPlugins ? true,
xineBackend ? false, xineLib, xineBackend ? false, xineLib,
withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ] buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xineLib ] else with gst_all_1; ++ (if xineBackend then [ xineLib ] else with gst_all_1;
[ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);

1
pkgs/applications/audio/radiotray-ng/default.nix
View File

@ -80,7 +80,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
checkInputs = [ gtest ]; checkInputs = [ gtest ];
checkPhase = "ctest";
# doCheck = stdenv.hostPlatform == stdenv.buildPlatform; # doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = false; # fails to pick up supplied gtest, tries to download it instead doCheck = false; # fails to pick up supplied gtest, tries to download it instead

4
pkgs/applications/audio/sonata/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook { stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook
, python3Packages, gnome3, gtk3, gobjectIntrospection}: , python3Packages, gnome3, gtk3, gobject-introspection}:
let let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
@ -29,7 +29,7 @@ in buildPythonApplication rec {
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
gobjectIntrospection gtk3 pygobject3 gobject-introspection gtk3 pygobject3
]; ];
# The optional tagpy dependency (for editing metadata) is not yet # The optional tagpy dependency (for editing metadata) is not yet

4
pkgs/applications/audio/vocal/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk { stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk
, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobjectIntrospection, wrapGAppsHook }: , clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vocal"; pname = "vocal";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
gobjectIntrospection gobject-introspection
libxml2 libxml2
ninja ninja
pkgconfig pkgconfig

4
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb { stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb
, glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox , glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox
, polkit, accountsservice, gtk-doc, gnome3, gobjectIntrospection, vala , polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala
, withQt4 ? false, qt4 , withQt4 ? false, qt4
, withQt5 ? false, qtbase , withQt5 ? false, qtbase
}: }:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
automake automake
gnome3.yelp-tools gnome3.yelp-tools
gnome3.yelp-xsl gnome3.yelp-xsl
gobjectIntrospection gobject-introspection
gtk-doc gtk-doc
intltool intltool
itstool itstool

31
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -3,16 +3,15 @@
, desktop-file-utils , desktop-file-utils
, docbook_xsl , docbook_xsl
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, fetchpatch
, fetchurl , fetchurl
, flatpak , flatpak
, glibcLocales , glibcLocales
, gnome3 , gnome3
, gobjectIntrospection , gobject-introspection
, gspell , gspell
, gtk-doc , gtk-doc
, gtk3 , gtk3
, gtksourceview3 , gtksourceview4
, hicolor-icon-theme , hicolor-icon-theme
, json-glib , json-glib
, jsonrpc-glib , jsonrpc-glib
@ -31,14 +30,14 @@
, wrapGAppsHook , wrapGAppsHook
}: }:
let let
version = "3.28.4"; version = "3.30.0";
pname = "gnome-builder"; pname = "gnome-builder";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ibb74jlyrl5f6rj1b74196zfg2qaf870lxgi76qzpkgwq0iya05"; sha256 = "1pshzpjy9rk6gijlm97s316aihykzxrmb07vilp17q5857passak";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -47,7 +46,7 @@ in stdenv.mkDerivation {
docbook_xsl docbook_xsl
docbook_xml_dtd_43 docbook_xml_dtd_43
glibcLocales # for Meson's gtkdochelper glibcLocales # for Meson's gtkdochelper
gobjectIntrospection gobject-introspection
gtk-doc gtk-doc
hicolor-icon-theme hicolor-icon-theme
meson meson
@ -67,7 +66,7 @@ in stdenv.mkDerivation {
gnome3.vte gnome3.vte
gspell gspell
gtk3 gtk3
gtksourceview3 gtksourceview4
json-glib json-glib
jsonrpc-glib jsonrpc-glib
libdazzle libdazzle
@ -87,24 +86,6 @@ in stdenv.mkDerivation {
patchShebangs build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py
''; '';
patches = [
(fetchpatch {
name = "absolute-shared-library-path.patch";
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/1011cabc519fd7322e2d695c79bfce3e18ff6200.patch";
sha256 = "1g12zziidzrphp527aa8sklfaln4qpjprkz73f0c9w5ph6k252fw";
})
(fetchpatch {
name = "python-libprefix.patch";
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/43494ce83a347f369ed4cfb8dd71d3b93452736b.patch";
sha256 = "0kgi3n3g13n1j4xa61ln9xiahcfdc43bxi5mw4yva2d5px445msf";
})
(fetchpatch {
name = "ostree-dependency.patch";
url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/8b11773b65c95f464a0de16b91318c1ca73deeae.patch";
sha256 = "18r4hd90id0w6r0lzqpw83bcj45nm9jhr46a0ffi1mcayb18mgbk";
})
];
mesonFlags = [ mesonFlags = [
"-Dpython_libprefix=${python3.libPrefix}" "-Dpython_libprefix=${python3.libPrefix}"
"-Dwith_docs=true" "-Dwith_docs=true"

4
pkgs/applications/editors/gnome-latex/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, wrapGAppsHook { stdenv, fetchurl, wrapGAppsHook
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let let
version = "3.30.1"; version = "3.30.2";
pname = "gnome-latex"; pname = "gnome-latex";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0yvkp311ikmiypzj2q6ypvyw5migxiqp8lwhyl3qq6mk6p0x66w8"; sha256 = "0fn3vy6w714wy0bz3y11zpdprpwxbv5xfiyyxjwp2nix9mbvv2sm";
}; };
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

4
pkgs/applications/editors/quilter/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3 { stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3
, granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3 , granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3
, discount, gobjectIntrospection, wrapGAppsHook }: , discount, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "quilter"; pname = "quilter";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
gobjectIntrospection gobject-introspection
meson meson
ninja ninja
pkgconfig pkgconfig

4
pkgs/applications/editors/rednotebook/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub { lib, buildPythonApplication, fetchFromGitHub
, gdk_pixbuf, glib, gobjectIntrospection, gtk3, gtksourceview, pango, webkitgtk , gdk_pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
, pygobject3, pyyaml , pygobject3, pyyaml
}: }:
@ -17,7 +17,7 @@ buildPythonApplication rec {
# We have not packaged tests. # We have not packaged tests.
doCheck = false; doCheck = false;
nativeBuildInputs = [ gobjectIntrospection ]; nativeBuildInputs = [ gobject-introspection ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gdk_pixbuf glib gtk3 gtksourceview pango webkitgtk gdk_pixbuf glib gtk3 gtksourceview pango webkitgtk

4
pkgs/applications/editors/vim/common.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }: { lib, fetchFromGitHub }:
rec { rec {
version = "8.1.0490"; version = "8.1.0535";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vim"; owner = "vim";
repo = "vim"; repo = "vim";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gmlz2w066pcrn0jzpv3gk1qwx148f33gvgf5nkfy4nl1ljki81r"; sha256 = "0kgh213ca2qfrwdqfimrnhlxidjbrg26icxw00rivjiv1blii7ck";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/graphics/mypaint/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobjectIntrospection, hicolor-icon-theme { stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection, hicolor-icon-theme
, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: , gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
let let
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
intltool pkgconfig scons swig wrapGAppsHook intltool pkgconfig scons swig wrapGAppsHook
gobjectIntrospection # for setup hook gobject-introspection # for setup hook
]; ];
buildInputs = [ buildInputs = [

4
pkgs/applications/graphics/photoflow/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: { stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobject-introspection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "photoflow-unstable-2018-08-28"; name = "photoflow-unstable-2018-08-28";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
pkgconfig pkgconfig
swig swig
automake automake
gobjectIntrospection gobject-introspection
cmake cmake
ninja ninja
]; ];

4
pkgs/applications/graphics/rapid-photo-downloader/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python3Packages { stdenv, fetchurl, python3Packages
, file, intltool, gobjectIntrospection, libgudev , file, intltool, gobject-introspection, libgudev
, udisks, glib, gnome3, gst_all_1, libnotify , udisks, glib, gnome3, gst_all_1, libnotify
, exiv2, exiftool, qt5, gdk_pixbuf , exiv2, exiftool, qt5, gdk_pixbuf
}: }:
@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
--replace "import problemnotification" "import raphodo.problemnotification" --replace "import problemnotification" "import raphodo.problemnotification"
''; '';
nativeBuildInputs = [ file intltool gobjectIntrospection ]; nativeBuildInputs = [ file intltool gobject-introspection ];
buildInputs = [ buildInputs = [
libgudev libgudev

13
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,23 +1,23 @@
{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib , webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook , gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
, gobjectIntrospection, itstool, libgdata }: , gobject-introspection, itstool, libgdata, python3 }:
# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
let let
pname = "shotwell"; pname = "shotwell";
version = "0.28.2"; version = "0.30.1";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n"; sha256 = "01hsmig06hjv34yf9y60hv2gml593xfkza4ilq4b22gr8l4v2qip";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook gobjectIntrospection meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobject-introspection
]; ];
buildInputs = [ buildInputs = [
@ -28,8 +28,9 @@ in stdenv.mkDerivation rec {
gnome3.gcr gnome3.defaultIconTheme libgdata gnome3.gcr gnome3.defaultIconTheme libgdata
]; ];
postInstall = '' postPatch = ''
glib-compile-schemas $out/share/glib-2.0/schemas chmod +x build-aux/meson/postinstall.py # patchShebangs requires executable file
patchShebangs build-aux/meson/postinstall.py
''; '';
passthru = { passthru = {

4
pkgs/applications/misc/font-manager/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, { stdenv, fetchFromGitHub, automake, autoconf, libtool,
pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool,
librsvg, vala, gnome3, wrapGAppsHook, gobjectIntrospection librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
gnome3.yelp-tools gnome3.yelp-tools
wrapGAppsHook wrapGAppsHook
# For setup hook # For setup hook
gobjectIntrospection gobject-introspection
]; ];
buildInputs = [ buildInputs = [

4
pkgs/applications/misc/gImageReader/default.nix
View File

@ -6,7 +6,7 @@
# Gtk deps # Gtk deps
# upstream gImagereader supports Qt too # upstream gImagereader supports Qt too
, gtk3, gobjectIntrospection, wrapGAppsHook , gtk3, gobject-introspection, wrapGAppsHook
, gnome3, gtkspell3, gtkspellmm, cairomm , gnome3, gtkspell3, gtkspellmm, cairomm
}: }:
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# Gtk specific # Gtk specific
wrapGAppsHook wrapGAppsHook
gobjectIntrospection gobject-introspection
]; ];
buildInputs = [ buildInputs = [

79
pkgs/applications/misc/gnome-recipes/default.nix Normal file
View File

@ -0,0 +1,79 @@
{ stdenv
, fetchurl
, meson
, ninja
, pkgconfig
, gnome3
, desktop-file-utils
, gettext
, itstool
, python3
, wrapGAppsHook
, gtk3
, glib
, libsoup
, gnome-online-accounts
, rest
, json-glib
, gnome-autoar
, gspell
, libcanberra }:
let
pname = "gnome-recipes";
version = "2.0.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v";
};
nativeBuildInputs = [
meson
ninja
pkgconfig
desktop-file-utils
gettext
itstool
python3
wrapGAppsHook
];
buildInputs = [
gtk3
glib
libsoup
gnome-online-accounts
rest
json-glib
gnome-autoar
gspell
libcanberra
];
# https://github.com/NixOS/nixpkgs/issues/36468
# https://gitlab.gnome.org/GNOME/recipes/issues/76
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
postPatch = ''
chmod +x src/list_to_c.py
patchShebangs src/list_to_c.py
patchShebangs meson_post_install.py
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "Recipe management application for GNOME";
homepage = https://wiki.gnome.org/Apps/Recipes;
maintainers = gnome3.maintainers;
license = licenses.gpl3;
platforms = platforms.unix;
};
}

4
pkgs/applications/misc/gnome-usage/default.nix
View File

@ -4,13 +4,13 @@
let let
pname = "gnome-usage"; pname = "gnome-usage";
version = "3.28.0"; version = "3.30.0";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq"; sha256 = "0f1vccw916az8hzsqmx6f57jvl68s3sbd3qk4rpwn42ks1v7nmsh";
}; };
nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];

4
pkgs/applications/misc/gramps/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3,
pango, gobjectIntrospection, wrapGAppsHook, pango, gobject-introspection, wrapGAppsHook,
# Optional packages: # Optional packages:
enableOSM ? true, osm-gps-map, enableOSM ? true, osm-gps-map,
enableGraphviz ? true, graphviz, enableGraphviz ? true, graphviz,
@ -13,7 +13,7 @@ in buildPythonApplication rec {
name = "gramps-${version}"; name = "gramps-${version}";
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ]
# Map support # Map support
++ stdenv.lib.optional enableOSM osm-gps-map ++ stdenv.lib.optional enableOSM osm-gps-map
# Graphviz support # Graphviz support

4
pkgs/applications/misc/guake/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales { stdenv, fetchFromGitHub, python3, gettext, gobject-introspection, wrapGAppsHook, glibcLocales
, gtk3, keybinder3, libnotify, libutempter, vte }: , gtk3, keybinder3, libnotify, libutempter, vte }:
let let
@ -14,7 +14,7 @@ in python3.pkgs.buildPythonApplication rec {
sha256 = "1j38z968ha8ij6wrgbwvr8ad930nvhybm9g7pf4s4zv6d3vln0vm"; sha256 = "1j38z968ha8ij6wrgbwvr8ad930nvhybm9g7pf4s4zv6d3vln0vm";
}; };
nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; nativeBuildInputs = [ gettext gobject-introspection wrapGAppsHook python3.pkgs.pip glibcLocales ];
buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; buildInputs = [ gtk3 keybinder3 libnotify python3 vte ];

2
pkgs/applications/misc/gxneur/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation {
sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
}; };
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ buildInputs = [
xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur

4
pkgs/applications/misc/kupfer/default.nix
View File

@ -2,7 +2,7 @@
, fetchurl , fetchurl
, intltool , intltool
, python3Packages , python3Packages
, gobjectIntrospection , gobject-introspection
, gtk3 , gtk3
, libwnck3 , libwnck3
, keybinder3 , keybinder3
@ -25,7 +25,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook intltool wrapGAppsHook intltool
# For setup hook # For setup hook
gobjectIntrospection wafHook gobject-introspection wafHook
]; ];
buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];

4
pkgs/applications/misc/notejot/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite { stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite
, gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }: , gtk3, gnome3, gtksourceview, json-glib, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "notejot"; pname = "notejot";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gobjectIntrospection gobject-introspection
meson meson
ninja ninja
pkgconfig pkgconfig

4
pkgs/applications/misc/onboard/default.nix
View File

@ -7,7 +7,7 @@
, glib , glib
, glibcLocales , glibcLocales
, gnome3 , gnome3
, gobjectIntrospection , gobject-introspection
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gtk3 , gtk3
, hunspell , hunspell
@ -88,7 +88,7 @@ in python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
glibcLocales glibcLocales
gobjectIntrospection # populate GI_TYPELIB_PATH gobject-introspection # populate GI_TYPELIB_PATH
intltool intltool
pkgconfig pkgconfig
]; ];

13
pkgs/applications/misc/orca/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, pkgconfig, fetchurl, buildPythonApplication { stdenv, pkgconfig, fetchurl, buildPythonApplication
, autoreconfHook, wrapGAppsHook, gobjectIntrospection , autoreconfHook, wrapGAppsHook, gobject-introspection
, intltool, yelp-tools, itstool, libxmlxx3 , intltool, yelp-tools, itstool, libxmlxx3
, python, pygobject3, gtk3, gnome3, substituteAll , python, pygobject3, gtk3, gnome3, substituteAll
, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
, xkbcomp, gsettings-desktop-schemas , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
, speechd, brltty, setproctitle, gst_all_1, gst-python , speechd, brltty, setproctitle, gst_all_1, gst-python
}: }:
let let
pname = "orca"; pname = "orca";
version = "3.28.2"; version = "3.30.1";
in buildPythonApplication rec { in buildPythonApplication rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -17,19 +17,22 @@ in buildPythonApplication rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q"; sha256 = "1b9s69frjmghjm1p9a4rrvknl9m0qlwr7mr4lsxkvjnblhsnw0g7";
}; };
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
cat = "${coreutils}/bin/cat";
lsof = "${lsof}/bin/lsof";
pgrep = "${procps}/bin/pgrep";
xkbcomp = "${xkbcomp}/bin/xkbcomp"; xkbcomp = "${xkbcomp}/bin/xkbcomp";
}) })
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
intltool yelp-tools itstool gobjectIntrospection intltool yelp-tools itstool gobject-introspection
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

49
pkgs/applications/misc/orca/fix-paths.patch
View File

@ -1,3 +1,32 @@
--- a/src/orca/debug.py
+++ b/src/orca/debug.py
@@ -474,7 +474,7 @@
return traceit
def getOpenFDCount(pid):
- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)])
+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)])
procs = procs.decode('UTF-8').split('\n')
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
@@ -482,7 +482,7 @@
def getCmdline(pid):
try:
- openFile = os.popen('cat /proc/%s/cmdline' % pid)
+ openFile = os.popen('@cat@ /proc/%s/cmdline' % pid)
cmdline = openFile.read()
openFile.close()
except:
@@ -492,7 +492,7 @@
return cmdline
def pidOf(procName):
- openFile = subprocess.Popen('pgrep %s' % procName,
+ openFile = subprocess.Popen('@pgrep@ %s' % procName,
shell=True,
stdout=subprocess.PIPE).stdout
pids = openFile.read()
--- a/src/orca/orca.py --- a/src/orca/orca.py
+++ b/src/orca/orca.py +++ b/src/orca/orca.py
@@ -239,7 +239,7 @@ @@ -239,7 +239,7 @@
@ -27,3 +56,23 @@
stdin=subprocess.PIPE, stdout=None, stderr=None) stdin=subprocess.PIPE, stdout=None, stderr=None)
p.communicate(_originalXmodmap) p.communicate(_originalXmodmap)
--- a/src/orca/orca_bin.py.in
+++ b/src/orca/orca_bin.py.in
@@ -59,7 +59,7 @@
name = "[DEAD]"
try:
- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid)
+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid)
except:
cmdline = '(exception encountered)'
else:
@@ -192,7 +192,7 @@
def otherOrcas():
"""Returns the pid of any other instances of Orca owned by this user."""
- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(),
+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(),
shell=True,
stdout=subprocess.PIPE).stdout
pids = openFile.read()

2
pkgs/applications/misc/pdf-quench/default.nix
View File

@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
gtk3 gtk3
gobjectIntrospection gobject-introspection
goocanvas2 goocanvas2
poppler_gi poppler_gi
]; ];

4
pkgs/applications/misc/pdfpc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }: , poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${product}-${version}"; name = "${product}-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake pkgconfig vala cmake pkgconfig vala
# For setup hook # For setup hook
gobjectIntrospection gobject-introspection
]; ];
buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
libpthreadstubs makeWrapper librsvg pcre ]; libpthreadstubs makeWrapper librsvg pcre ];

4
pkgs/applications/misc/plank/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
, bamf, gdk_pixbuf, libdbusmenu-gtk3, file , bamf, gdk_pixbuf, libdbusmenu-gtk3, file
, wrapGAppsHook, autoreconfHook, gobjectIntrospection }: , wrapGAppsHook, autoreconfHook, gobject-introspection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "plank"; pname = "plank";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
intltool intltool
libxml2 # xmllint libxml2 # xmllint
wrapGAppsHook wrapGAppsHook
gobjectIntrospection gobject-introspection
autoreconfHook autoreconfHook
]; ];

4
pkgs/applications/misc/redshift/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool { stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool
, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection
, gtk3, python, pygobject3, hicolor-icon-theme, pyxdg , gtk3, python, pygobject3, hicolor-icon-theme, pyxdg
, withQuartz ? stdenv.isDarwin, ApplicationServices , withQuartz ? stdenv.isDarwin, ApplicationServices
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gobjectIntrospection gobject-introspection
gtk3 gtk3
python python
hicolor-icon-theme hicolor-icon-theme

4
pkgs/applications/misc/regextester/default.nix
View File

@ -9,7 +9,7 @@
, gnome3 , gnome3
, meson , meson
, ninja , ninja
, gobjectIntrospection , gobject-introspection
, gsettings-desktop-schemas , gsettings-desktop-schemas
, vala_0_40 , vala_0_40
, wrapGAppsHook }: , wrapGAppsHook }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
gettext gettext
gobjectIntrospection gobject-introspection
libxml2 libxml2
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook wrapGAppsHook

4
pkgs/applications/misc/safeeyes/default.nix
View File

@ -1,4 +1,4 @@
{ lib, python3Packages, gobjectIntrospection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg { lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg
}: }:
let inherit (python3Packages) python buildPythonApplication fetchPypi; let inherit (python3Packages) python buildPythonApplication fetchPypi;
@ -16,7 +16,7 @@ in buildPythonApplication rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
gobjectIntrospection gobject-introspection
gnome3.defaultIconTheme gnome3.defaultIconTheme
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];

4
pkgs/applications/misc/sequeler/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, python3, desktop-file-utils , meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }: , gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
sha256 = "14a0i9y003m4pvdfp4ax7jfxvyzvyfg45zhln44rm08rfngb0f7k"; sha256 = "14a0i9y003m4pvdfp4ax7jfxvyzvyfg45zhln44rm08rfngb0f7k";
}; };
nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ]; nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ]; buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];

4
pkgs/applications/misc/solaar/default.nix
View File

@ -1,4 +1,4 @@
{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobjectIntrospection}: {fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "solaar-unstable-${version}"; name = "solaar-unstable-${version}";
version = "2018-02-02"; version = "2018-02-02";
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3"; sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3";
}; };
propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobjectIntrospection gtk3]; propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobject-introspection gtk3];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/solaar" \ wrapProgram "$out/bin/solaar" \
--prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PYTHONPATH : "$PYTHONPATH" \

4
pkgs/applications/misc/synapse/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection , keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection
}: }:
let let
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig gettext vala_0_38 pkgconfig gettext vala_0_38
# For setup hook # For setup hook
gobjectIntrospection gobject-introspection
]; ];
buildInputs = [ buildInputs = [
glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist

4
pkgs/applications/misc/terminator/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobjectIntrospection { stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection
, libnotify, wrapGAppsHook, gnome3 , libnotify, wrapGAppsHook, gnome3
}: }:
@ -11,7 +11,7 @@ python2.pkgs.buildPythonApplication rec {
sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69";
}; };
nativeBuildInputs = [ file intltool wrapGAppsHook gobjectIntrospection ]; nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ];
buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ];
propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ];

4
pkgs/applications/misc/tootle/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, python3 , meson, ninja, pkgconfig, python3
, gnome3, vala, gobjectIntrospection, wrapGAppsHook , gnome3, vala, gobject-introspection, wrapGAppsHook
, gtk3, granite , gtk3, granite
, json-glib, glib, glib-networking , json-glib, glib, glib-networking
}: }:
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi"; sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi";
}; };
nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobject-introspection wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 granite json-glib glib glib-networking gtk3 granite json-glib glib glib-networking
gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas

4
pkgs/applications/misc/udiskie/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, asciidoc-full, gettext { stdenv, fetchFromGitHub, asciidoc-full, gettext
, gobjectIntrospection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg , gobject-introspection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
, udisks2, wrapGAppsHook , udisks2, wrapGAppsHook
, buildPythonApplication , buildPythonApplication
, docopt , docopt
@ -26,7 +26,7 @@ buildPythonApplication rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gettext gobjectIntrospection gtk3 libnotify docopt gettext gobject-introspection gtk3 libnotify docopt
pygobject3 pyyaml udisks2 libappindicator-gtk3 pygobject3 pyyaml udisks2 libappindicator-gtk3
]; ];

4
pkgs/applications/misc/workrave/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, wrapGAppsHook { stdenv, fetchFromGitHub, wrapGAppsHook
, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig , autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig
, libICE, libSM, libXScrnSaver, libXtst, cheetah , libICE, libSM, libXScrnSaver, libXtst, cheetah
, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo , gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base , cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base
, gst-plugins-good, libsigcxx }: , gst-plugins-good, libsigcxx }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
libICE libSM libXScrnSaver libXtst cheetah libICE libSM libXScrnSaver libXtst cheetah
gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm gobject-introspection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx
]; ];

4
pkgs/applications/networking/browsers/eolie/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, meson, ninja, pkgconfig { stdenv, fetchgit, meson, ninja, pkgconfig
, python3, gtk3, libsecret, gst_all_1, webkitgtk , python3, gtk3, libsecret, gst_all_1, webkitgtk
, glib-networking, gtkspell3, hunspell, desktop-file-utils , glib-networking, gtkspell3, hunspell, desktop-file-utils
, gobjectIntrospection, wrapGAppsHook }: , gobject-introspection, wrapGAppsHook }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
name = "eolie-${version}"; name = "eolie-${version}";
@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
gobjectIntrospection gobject-introspection
meson meson
ninja ninja
pkgconfig pkgconfig

2
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr
libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core
(libsoup.override {gnomeSupport = true; valaSupport = true;}) (libsoup.override {gnomeSupport = true;})
] ++ stdenv.lib.optionals zeitgeistSupport [ ] ++ stdenv.lib.optionals zeitgeistSupport [
zeitgeist zeitgeist
]; ];

4
pkgs/applications/networking/corebird/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40 { stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection , meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
, glib-networking, python3 }: , glib-networking, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja vala_0_40 pkgconfig wrapGAppsHook python3 meson ninja vala_0_40 pkgconfig wrapGAppsHook python3
gobjectIntrospection # for setup hook gobject-introspection # for setup hook
]; ];
buildInputs = [ buildInputs = [

4
pkgs/applications/networking/ftp/taxi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite { stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
, gtk3, gnome3, libsoup, libsecret, gobjectIntrospection, wrapGAppsHook }: , gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "taxi"; pname = "taxi";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gobjectIntrospection gobject-introspection
meson meson
ninja ninja
pkgconfig pkgconfig

4
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
, xorg, libXdmcp, libxkbcommon , xorg, libXdmcp, libxkbcommon
, libnotify, libsoup , libnotify, libsoup
, libgcrypt , libgcrypt
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
qrencode qrencode
gobjectIntrospection gobject-introspection
glib-networking glib-networking
glib glib
gnome3.libgee gnome3.libgee

4
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -1,5 +1,5 @@
{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook { buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
, python, gtk3, gobjectIntrospection , python, gtk3, gobject-introspection
, nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow , nbxmpp, pyasn1, pygobject3, gnome3, dbus-python, pillow
, xvfb_run, dbus , xvfb_run, dbus
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
@ -30,7 +30,7 @@ buildPythonApplication rec {
''; '';
buildInputs = [ buildInputs = [
gobjectIntrospection gtk3 gnome3.defaultIconTheme gobject-introspection gtk3 gnome3.defaultIconTheme
] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
++ optional enableSecrets libsecret ++ optional enableSecrets libsecret
++ optional enableSpelling gspell ++ optional enableSpelling gspell

4
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } : { stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, autoreconfHook }:
let let
@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [pidgin glib json-glib mercurial]; buildInputs = [ pidgin glib json-glib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;

4
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig { stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }: , gnome3, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
project = "telepathy-logger"; project = "telepathy-logger";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper pkgconfig intltool libxslt gobjectIntrospection makeWrapper pkgconfig intltool libxslt gobject-introspection
]; ];
buildInputs = [ buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib dbus-glib libxml2 sqlite telepathy-glib

4
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup { stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
, libuuid, openssl, pcre, sqlite, pkgconfigUpstream }: , libuuid, openssl, pcre, sqlite, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-salut"; pname = "telepathy-salut";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
sqlite pcre telepathy-glib.python ]; sqlite pcre telepathy-glib.python ];
nativeBuildInputs = [ libxslt pkgconfigUpstream ]; nativeBuildInputs = [ libxslt pkgconfig ];
configureFlags = [ "--disable-avahi-tests" ]; configureFlags = [ "--disable-avahi-tests" ];

5
pkgs/applications/networking/instant-messengers/utox/default.nix
View File

@ -32,11 +32,6 @@ stdenv.mkDerivation rec {
doCheck = stdenv.hostPlatform == stdenv.buildPlatform; doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkInputs = [ check ]; checkInputs = [ check ];
checkPhase = ''
runHook preCheck
ctest -VV
runHook postCheck
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight Tox client"; description = "Lightweight Tox client";

4
pkgs/applications/networking/mailreaders/astroid/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk222x { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, makeWrapper, python3, python3Packages , makeWrapper, python3, python3Packages
, vim ? vim_configurable.override { , vim ? vim_configurable.override {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtkmm gmime3 webkitgtk222x libsass gnome3.libpeas buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
python3 python3Packages.pygobject3 python3 python3Packages.pygobject3
notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);

4
pkgs/applications/networking/mailreaders/balsa/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, { stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme, webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme,
libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection, libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection,
hicolor-icon-theme, wrapGAppsHook hicolor-icon-theme, wrapGAppsHook
}: }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool intltool
gobjectIntrospection gobject-introspection
hicolor-icon-theme hicolor-icon-theme
wrapGAppsHook wrapGAppsHook
]; ];

4
pkgs/applications/networking/newsreaders/liferea/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1
, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg
, gobjectIntrospection, glib-networking, hicolor-icon-theme , gobject-introspection, glib-networking, hicolor-icon-theme
}: }:
let let
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas
libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection libpeas gsettings-desktop-schemas json-glib dconf gobject-introspection
librsvg glib-networking libnotify hicolor-icon-theme librsvg glib-networking libnotify hicolor-icon-theme
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad

4
pkgs/applications/networking/syncthing-gtk/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
, bcrypt, gobjectIntrospection }: , bcrypt, gobject-introspection }:
buildPythonApplication rec { buildPythonApplication rec {
version = "0.9.4"; version = "0.9.4";
@ -17,7 +17,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook wrapGAppsHook
# For setup hook populating GI_TYPELIB_PATH # For setup hook populating GI_TYPELIB_PATH
gobjectIntrospection gobject-introspection
]; ];
buildInputs = [ buildInputs = [

4
pkgs/applications/networking/transporter/default.nix
View File

@ -9,7 +9,7 @@
, gnome3 , gnome3
, libxml2 , libxml2
, gettext , gettext
, gobjectIntrospection , gobject-introspection
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
, magic-wormhole , magic-wormhole
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
gettext gettext
gobjectIntrospection # For setup hook gobject-introspection # For setup hook
libxml2 libxml2
meson meson
ninja ninja

4
pkgs/applications/networking/weather/meteo/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, granite, gtk3 { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, granite, gtk3
, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk , gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk
, libappindicator, desktop-file-utils, appstream, gobjectIntrospection, wrapGAppsHook }: , libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "meteo"; pname = "meteo";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
appstream appstream
desktop-file-utils desktop-file-utils
gobjectIntrospection gobject-introspection
meson meson
ninja ninja
pkgconfig pkgconfig

4
pkgs/applications/office/aesop/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3 { stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3
, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }: , gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aesop"; pname = "aesop";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
gobjectIntrospection gobject-introspection
meson meson
ninja ninja
pkgconfig pkgconfig

4
pkgs/applications/office/autokey/default.nix
View File

@ -1,4 +1,4 @@
{ lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection
, gnome3, libappindicator-gtk3, libnotify }: , gnome3, libappindicator-gtk3, libnotify }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
# Note: no dependencies included for Qt GUI because Qt ui is poorly # Note: no dependencies included for Qt GUI because Qt ui is poorly
# maintained—see https://github.com/autokey/autokey/issues/51 # maintained—see https://github.com/autokey/autokey/issues/51
buildInputs = [ wrapGAppsHook gobjectIntrospection gnome3.gtksourceview buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview
libappindicator-gtk3 libnotify ]; libappindicator-gtk3 libnotify ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

4
pkgs/applications/office/bookworm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3 { stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3
, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }: , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bookworm"; pname = "bookworm";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
bash bash
gobjectIntrospection gobject-introspection
libxml2 libxml2
meson meson
ninja ninja

3
pkgs/applications/office/gnucash/2.4.nix
View File

@ -2,6 +2,7 @@
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme , libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme
, pcre
}: }:
/* If you experience GConf errors when running GnuCash on NixOS, see /* If you experience GConf errors when running GnuCash on NixOS, see
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
libgnomeprint goffice enchant gettext intltool perl guile slibGuile libgnomeprint goffice enchant gettext intltool perl guile slibGuile
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
hicolor-icon-theme hicolor-icon-theme pcre
]; ];
propagatedUserEnvPkgs = [ gconf ]; propagatedUserEnvPkgs = [ gconf ];

4
pkgs/applications/office/gnucash/default.nix
View File

@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ dconf ]; propagatedUserEnvPkgs = [ dconf ];
# glib-2.58 deprecrated g_type_class_add_private
# Should probably be removed next version bump
CXXFLAGS = [ "-Wno-deprecated-declarations" ];
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
''; '';

8
pkgs/applications/office/kmymoney/default.nix
View File

@ -60,10 +60,12 @@ stdenv.mkDerivation rec {
"$out/share/kmymoney/weboob/kmymoneyweboob.py" "$out/share/kmymoney/weboob/kmymoneyweboob.py"
''; '';
doInstallCheck = true; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
installCheckInputs = [ xvfb_run ]; installCheckInputs = [ xvfb_run ];
installCheckPhase = '' installCheckPhase = let
QT_PLUGIN_PATH=${lib.escapeShellArg "${qtbase.bin}/${qtbase.qtPluginPrefix}"} \ pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}";
in lib.optionalString doInstallCheck ''
QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} \
xvfb-run -s '-screen 0 1024x768x24' make test \ xvfb-run -s '-screen 0 1024x768x24' make test \
ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now. ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
''; '';

3
pkgs/applications/office/planner/default.nix
View File

@ -23,6 +23,9 @@ in stdenv.mkDerivation {
sha256 = "1bhh05kkbnhibldc1fc7kv7bwf8aa1vh4q379syqd3jbas8y521g"; sha256 = "1bhh05kkbnhibldc1fc7kv7bwf8aa1vh4q379syqd3jbas8y521g";
}; };
# planner-popup-button.c:81:2: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations]
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
nativeBuildInputs = with gnome2; [ nativeBuildInputs = with gnome2; [
pkgconfig pkgconfig
intltool intltool

4
pkgs/applications/office/spice-up/default.nix
View File

@ -6,7 +6,7 @@
, gtk3 , gtk3
, granite , granite
, gnome3 , gnome3
, gobjectIntrospection , gobject-introspection
, json-glib , json-glib
, cmake , cmake
, ninja , ninja
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
ninja ninja
gettext gettext
libxml2 libxml2
gobjectIntrospection # For setup hook gobject-introspection # For setup hook
]; ];
buildInputs = [ buildInputs = [
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged

4
pkgs/applications/office/tryton/default.nix
View File

@ -2,7 +2,7 @@
, python2Packages , python2Packages
, pkgconfig , pkgconfig
, librsvg , librsvg
, gobjectIntrospection , gobject-introspection
, atk , atk
, gtk3 , gtk3
, gtkspell3 , gtkspell3
@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec {
inherit pname version; inherit pname version;
sha256 = "43759d22b061a7a392a534d19a045fafd442ce98a0e390ee830127367dcaf4b4"; sha256 = "43759d22b061a7a392a534d19a045fafd442ce98a0e390ee830127367dcaf4b4";
}; };
nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig gobject-introspection ];
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
chardet chardet
dateutil dateutil

2
pkgs/applications/science/biology/EZminc/default.nix
View File

@ -18,8 +18,6 @@ stdenv.mkDerivation rec { pname = "EZminc";
"-DEZMINC_BUILD_MRFSEG=TRUE" "-DEZMINC_BUILD_MRFSEG=TRUE"
"-DEZMINC_BUILD_DD=TRUE" ]; "-DEZMINC_BUILD_DD=TRUE" ];
checkPhase = "ctest --output-on-failure ../tests/"; # but ctest doesn't find the tests ...
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

3
pkgs/applications/science/biology/N3/default.nix
View File

@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ];
checkPhase = "ctest --output-on-failure";
# don't run the tests as they fail at least due to missing program wrappers in this phase ...
postFixup = '' postFixup = ''
for p in $out/bin/*; do for p in $out/bin/*; do
wrapProgram $p --prefix PERL5LIB : $PERL5LIB wrapProgram $p --prefix PERL5LIB : $PERL5LIB

2
pkgs/applications/science/biology/ants/default.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
checkPhase = "ctest";
postInstall = '' postInstall = ''
for file in $out/bin/*; do for file in $out/bin/*; do
wrapProgram $file --set ANTSPATH "$out/bin" wrapProgram $file --set ANTSPATH "$out/bin"

2
pkgs/applications/science/biology/inormalize/default.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEBTKS_DIR=${EBTKS}/lib/" ];
checkPhase = "ctest --output-on-failure"; # but no tests
postFixup = '' postFixup = ''
for p in $out/bin/*; do for p in $out/bin/*; do
wrapProgram $p --prefix PERL5LIB : $PERL5LIB wrapProgram $p --prefix PERL5LIB : $PERL5LIB

2
pkgs/applications/science/biology/minc-tools/default.nix
View File

@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
checkPhase = "ctest --output-on-failure"; # still some weird test failures though
postFixup = '' postFixup = ''
for prog in minccomplete minchistory mincpik; do for prog in minccomplete minchistory mincpik; do
wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB

4
pkgs/applications/science/math/nasc/default.nix
View File

@ -8,7 +8,7 @@
, cmake , cmake
, vala_0_40 , vala_0_40
, libqalculate , libqalculate
, gobjectIntrospection , gobject-introspection
, wrapGAppsHook }: , wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook wrapGAppsHook
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
cmake cmake
gobjectIntrospection # for setup-hook gobject-introspection # for setup-hook
]; ];
buildInputs = [ buildInputs = [

4
pkgs/applications/search/catfish/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, file, which, intltool, gobjectIntrospection, { stdenv, fetchurl, file, which, intltool, gobject-introspection,
findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme,
wrapGAppsHook wrapGAppsHook
}: }:
@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
file file
which which
intltool intltool
gobjectIntrospection gobject-introspection
wrapGAppsHook wrapGAppsHook
]; ];

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport; assert svnSupport -> perlSupport;
let let
version = "2.19.1"; version = "2.19.2";
svn = subversionClient.override { perlBindings = perlSupport; }; svn = subversionClient.override { perlBindings = perlSupport; };
in in
@ -29,7 +29,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1dfv43lmdnxz42504jc89sihbv1d4d6kgqcz3c5ji140kfm5cl1l"; sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw";
}; };
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

8
pkgs/applications/version-management/meld/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook { stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook
, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file , libxml2, gobject-introspection, gtk3, gnome3, cairo, file
}: }:
let let
pname = "meld"; pname = "meld";
version = "3.18.2"; version = "3.18.3";
inherit (python3Packages) python buildPythonApplication pycairo pygobject3; inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
in buildPythonApplication rec { in buildPythonApplication rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "109px6phfizi2jqrc7d7k7j6nvmanbfp5lykqfrk2sky77sand0r"; sha256 = "0vn1qx60f8113x8wh7f4bflhzir1vx7p0wdfi7nbip6fh8gaf3ln";
}; };
buildInputs = [ buildInputs = [
@ -20,7 +20,7 @@ in buildPythonApplication rec {
gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo
gnome3.defaultIconTheme gnome3.dconf file gnome3.defaultIconTheme gnome3.dconf file
]; ];
propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; propagatedBuildInputs = [ gobject-introspection pygobject3 gtk3 ];
installPhase = '' installPhase = ''
mkdir -p "$out/lib/${python.libPrefix}/site-packages" mkdir -p "$out/lib/${python.libPrefix}/site-packages"

4
pkgs/applications/video/gnomecast/default.nix
View File

@ -1,4 +1,4 @@
{ lib, python3Packages, gtk3, gobjectIntrospection, ffmpeg, wrapGAppsHook }: { lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }:
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
@ -13,7 +13,7 @@ buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
propagatedBuildInputs = [ propagatedBuildInputs = [
PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python
gtk3 gobjectIntrospection gtk3 gobject-introspection
]; ];
preFixup = '' preFixup = ''

4
pkgs/applications/video/kazam/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobjectIntrospection { stdenv, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection
, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio }: , gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f"; sha256 = "1qygnrvm6aqixbyivhssp70hs0llxwk7lh3j7idxa2jbkk06hj4f";
}; };
nativeBuildInputs = [ gobjectIntrospection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ];
buildInputs = [ buildInputs = [
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3
keybinder3 libappindicator-gtk3 keybinder3 libappindicator-gtk3

4
pkgs/applications/video/mpv/scripts/mpris.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, gobjectIntrospection, mpv }: { stdenv, fetchFromGitHub, pkgconfig, gobject-introspection, mpv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpv-mpris-${version}.so"; name = "mpv-mpris-${version}.so";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gobjectIntrospection mpv ]; buildInputs = [ gobject-introspection mpv ];
installPhase = '' installPhase = ''
cp mpris.so $out cp mpris.so $out

29
pkgs/applications/video/pitivi/default.nix
View File

@ -1,25 +1,26 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst, gtk3 , python3Packages, gst_all_1, gtk3
, gobjectIntrospection, librsvg, gnome3, libnotify , gobject-introspection, librsvg, gnome3, libnotify
, meson, ninja , meson, ninja
}: }:
let let
version = "0.99"; version = "0.999";
# gst-transcoder will eventually be merged with gstreamer (according to # gst-transcoder will eventually be merged with gstreamer (according to
# gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we
# don't bother exposing the package to all of nixpkgs. # don't bother exposing the package to all of nixpkgs.
gst-transcoder = stdenv.mkDerivation rec { gst-transcoder = stdenv.mkDerivation rec {
version = "1.12.2"; version = "1.14.1";
name = "gst-transcoder-${version}"; name = "gst-transcoder-${version}";
src = fetchurl { src = fetchFromGitHub {
name = "${name}.tar.gz"; owner = "pitivi";
url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz"; repo = "gst-transcoder";
sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9"; rev = version;
sha256 = "16skiz9akavssii529v9nr8zd54w43livc14khdyzv164djg9q8f";
}; };
nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection python3 ];
buildInputs = with gst; [ gstreamer gst-plugins-base ]; buildInputs = with gst_all_1; [ gstreamer gst-plugins-base ];
}; };
in python3Packages.buildPythonApplication rec { in python3Packages.buildPythonApplication rec {
@ -27,7 +28,7 @@ in python3Packages.buildPythonApplication rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69"; sha256 = "0mxp2p4gg976fp1vj3rb5rmpl5mqfzncm9vw2719irl32f1qlvyb";
}; };
format = "other"; format = "other";
@ -46,11 +47,11 @@ in python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ];
buildInputs = [ buildInputs = [
gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound gobject-introspection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound
gnome3.defaultIconTheme gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas libnotify gnome3.gsettings-desktop-schemas libnotify
gst-transcoder gst-transcoder
] ++ (with gst; [ ] ++ (with gst_all_1; [
gstreamer gst-editing-services gstreamer gst-editing-services
gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-base (gst-plugins-good.override { gtkSupport = true; })
gst-plugins-bad gst-plugins-ugly gst-libav gst-validate gst-plugins-bad gst-plugins-ugly gst-libav gst-validate

4
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, python3Packages, intltool, file { stdenv, fetchurl, python3Packages, intltool, file
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf , wrapGAppsHook, gtk-vnc, vte, avahi, dconf
, gobjectIntrospection, libvirt-glib, system-libvirt , gobject-introspection, libvirt-glib, system-libvirt
, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
, spiceSupport ? true, spice-gtk ? null , spiceSupport ? true, spice-gtk ? null
, cpio, e2fsprogs, findutils, gzip , cpio, e2fsprogs, findutils, gzip
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook intltool file wrapGAppsHook intltool file
gobjectIntrospection # for setup hook populating GI_TYPELIB_PATH gobject-introspection # for setup hook populating GI_TYPELIB_PATH
]; ];
buildInputs = buildInputs =

4
pkgs/applications/window-managers/awesome/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf { stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , xcb-util-cursor, makeWrapper, pango, gobject-introspection, unclutter
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
, which, dbus, nettools, git, asciidoc, doxygen , which, dbus, nettools, git, asciidoc, doxygen
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
@ -30,7 +30,7 @@ with luaPackages; stdenv.mkDerivation rec {
]; ];
propagatedUserEnvPkgs = [ hicolor-icon-theme ]; propagatedUserEnvPkgs = [ hicolor-icon-theme ];
buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection
git lgi libpthreadstubs libstartup_notification git lgi libpthreadstubs libstartup_notification
libxdg_basedir lua nettools pango xcb-util-cursor libxdg_basedir lua nettools pango xcb-util-cursor
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence

4
pkgs/applications/window-managers/i3/i3ipc-glib.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb { stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb
, autoreconfHook, json-glib, gtk-doc, which , autoreconfHook, json-glib, gtk-doc, which
, gobjectIntrospection , gobject-introspection
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook which pkgconfig ]; nativeBuildInputs = [ autoreconfHook which pkgconfig ];
buildInputs = [ libxcb json-glib gtk-doc xproto gobjectIntrospection ]; buildInputs = [ libxcb json-glib gtk-doc xproto gobject-introspection ];
preAutoreconf = '' preAutoreconf = ''

5
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -269,9 +269,8 @@ stdenv.mkDerivation {
## Man page and info support ## Man page and info support
## ##
mkdir -p $man/nix-support $info/nix-support ln -s ${bintools.man} $man
echo ${bintools.man or ""} >> $man/nix-support/propagated-user-env-packages ln -s ${bintools.info} $info
echo ${bintools.info or ""} >> $info/nix-support/propagated-user-env-packages
'' ''
+ '' + ''

5
pkgs/build-support/cc-wrapper/default.nix
View File

@ -263,9 +263,8 @@ stdenv.mkDerivation {
## Man page and info support ## Man page and info support
## ##
mkdir -p $man/nix-support $info/nix-support ln -s ${cc.man} $man
printWords ${cc.man or ""} > $man/nix-support/propagated-user-env-packages ln -s ${cc.info} $info
printWords ${cc.info or ""} > $info/nix-support/propagated-user-env-packages
'' ''
+ '' + ''

7
pkgs/build-support/rust/fetchcargo.nix
View File

@ -38,18 +38,19 @@ stdenv.mkDerivation {
fi fi
export CARGO_HOME=$(mktemp -d cargo-home.XXX) export CARGO_HOME=$(mktemp -d cargo-home.XXX)
CARGO_CONFIG=$(mktemp cargo-config.XXXX)
${cargoUpdateHook} ${cargoUpdateHook}
mkdir -p $out mkdir -p $out
cargo vendor $out | cargo-vendor-normalise > config cargo vendor $out | cargo-vendor-normalise > $CARGO_CONFIG
# fetchcargo used to never keep the config output by cargo vendor # fetchcargo used to never keep the config output by cargo vendor
# and instead hardcode the config in ./fetchcargo-default-config.toml. # and instead hardcode the config in ./fetchcargo-default-config.toml.
# This broke on packages needing git dependencies, so now we keep the config. # This broke on packages needing git dependencies, so now we keep the config.
# But not to break old cargoSha256, if the previous behavior was enough, # But not to break old cargoSha256, if the previous behavior was enough,
# we don't store the config. # we don't store the config.
if ! cmp config ${./fetchcargo-default-config.toml} > /dev/null; then if ! cmp $CARGO_CONFIG ${./fetchcargo-default-config.toml} > /dev/null; then
install -Dt $out/.cargo config; install -Dt $out/.cargo $CARGO_CONFIG;
fi; fi;
''; '';

2
pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
View File

@ -10,7 +10,7 @@ updateSourceDateEpoch() {
local newestFile="${res[1]}" local newestFile="${res[1]}"
# Update $SOURCE_DATE_EPOCH if the most recent file we found is newer. # Update $SOURCE_DATE_EPOCH if the most recent file we found is newer.
if [ "$time" -gt "$SOURCE_DATE_EPOCH" ]; then if [ "${time:-0}" -gt "$SOURCE_DATE_EPOCH" ]; then
echo "setting SOURCE_DATE_EPOCH to timestamp $time of file $newestFile" echo "setting SOURCE_DATE_EPOCH to timestamp $time of file $newestFile"
export SOURCE_DATE_EPOCH="$time" export SOURCE_DATE_EPOCH="$time"

12
pkgs/data/fonts/cantarell-fonts/default.nix
View File

@ -2,20 +2,26 @@
let let
pname = "cantarell-fonts"; pname = "cantarell-fonts";
version = "0.100"; version = "0.110";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81"; sha256 = "19rll0h4xjn83lqm0zc4088y0vkrx1wxg8jz9imvgd8snmfxfm54";
}; };
nativeBuildInputs = [ meson ninja gettext appstream-glib ]; nativeBuildInputs = [ meson ninja gettext appstream-glib ];
# ad-hoc fix for https://github.com/NixOS/nixpkgs/issues/50855
# until we fix gettext's envHook
preBuild = ''
export GETTEXTDATADIRS="$GETTEXTDATADIRS_FOR_BUILD"
'';
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1"; outputHash = "052nxmhw2j8yvcj90r8xhjf0mzim8h6syip7winxb28vavj6jnba";
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

4
pkgs/desktops/deepin/deepin-terminal/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala, { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
gettext, gobjectIntrospection, at-spi2-core, dbus, epoxy, expect, gettext, gobject-introspection, at-spi2-core, dbus, epoxy, expect,
gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg,
libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck,
deepin-menu, deepin-shortcut-viewer, deepin }: deepin-menu, deepin-shortcut-viewer, deepin }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
ninja ninja
vala vala
gettext gettext
gobjectIntrospection # For setup hook gobject-introspection # For setup hook
]; ];
buildInputs = [ buildInputs = [

14
pkgs/desktops/deepin/go-gir-generator/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, { stdenv, fetchFromGitHub, pkgconfig, go, gobject-introspection,
libgudev, deepin }: libgudev, deepin, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -13,13 +13,21 @@ stdenv.mkDerivation rec {
sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb"; sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb";
}; };
patches = [
# fix: dde-api build error with gobject-introspection 1.58+
(fetchurl {
url = https://github.com/linuxdeepin/go-gir-generator/commit/a7ab229201e28d1be727f5021b3588fa4a1acf5f.patch;
sha256 = "13ywalwkjg8wwvd0pvmc2rv1h38airyvimdn9jfb5wis9xm48401";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
go go
]; ];
buildInputs = [ buildInputs = [
gobjectIntrospection gobject-introspection
libgudev libgudev
]; ];

4
pkgs/desktops/gnome-3/apps/accerciser/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobjectIntrospection { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection
, itstool, libxml2, python3Packages, at-spi2-core , itstool, libxml2, python3Packages, at-spi2-core
, dbus, intltool, libwnck3 }: , dbus, intltool, libwnck3 }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig wrapGAppsHook itstool intltool pkgconfig wrapGAppsHook itstool intltool
gobjectIntrospection # For setup hook gobject-introspection # For setup hook
]; ];
buildInputs = [ buildInputs = [
gtk3 libxml2 python3Packages.python python3Packages.pyatspi gtk3 libxml2 python3Packages.python python3Packages.pyatspi

Some files were not shown because too many files have changed in this diff Show More