Merge staging-next into master
This commit is contained in:
Frederik Rietdijk
commit
2fcb11a244
@ -602,11 +602,10 @@ as the interpreter unless overridden otherwise.
|
||||
All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`:
|
||||
|
||||
* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
|
||||
* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
|
||||
* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version.
|
||||
* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
|
||||
* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
|
||||
* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
|
||||
* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
|
||||
* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
|
||||
* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
|
||||
* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`.
|
||||
* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
|
||||
@ -615,6 +614,14 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll
|
||||
* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`.
|
||||
* `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
|
||||
|
||||
The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special
|
||||
interest for Python packages, either because these are primarily used, or because their behaviour is different:
|
||||
|
||||
* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`.
|
||||
* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked.
|
||||
* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here.
|
||||
* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here.
|
||||
|
||||
##### Overriding Python packages
|
||||
|
||||
The `buildPythonPackage` function has a `overridePythonAttrs` method that
|
||||
@ -874,7 +881,6 @@ example of such a situation is when `py.test` is used.
|
||||
'';
|
||||
}
|
||||
```
|
||||
- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
|
||||
- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
|
||||
|
||||
## FAQ
|
||||
@ -1123,6 +1129,14 @@ LLVM implementation. To use that one instead, Intel recommends users set it with
|
||||
Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
|
||||
moreover, Hydra is not building and distributing pre-compiled binaries using it.
|
||||
|
||||
### What inputs do `setup_requires`, `install_requires` and `tests_require` map to?
|
||||
|
||||
In a `setup.py` or `setup.cfg` it is common to declare dependencies:
|
||||
|
||||
* `setup_requires` corresponds to `nativeBuildInputs`
|
||||
* `install_requires` corresponds to `propagatedBuildInputs`
|
||||
* `tests_require` corresponds to `checkInputs`
|
||||
|
||||
## Contributing
|
||||
|
||||
### Contributing guidelines
|
||||
|
||||
@ -182,6 +182,20 @@
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <varname>buildPythonPackage</varname> function now sets <varname>strictDeps = true</varname>
|
||||
to help distinguish between native and non-native dependencies in order to
|
||||
improve cross-compilation compatibility. Note however that this may break
|
||||
user expressions.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <varname>buildPythonPackage</varname> function now sets <varname>LANG = C.UTF-8</varname>
|
||||
to enable Unicode support. The <varname>glibcLocales</varname> package is no longer needed as a build input.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Syncthing state and configuration data has been moved from
|
||||
|
||||
@ -53,7 +53,7 @@ in
|
||||
|
||||
# Supplies some abstract icons such as:
|
||||
# utilities-terminal, accessories-text-editor
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
|
||||
hicolor-icon-theme
|
||||
tango-icon-theme
|
||||
|
||||
@ -96,8 +96,8 @@ in
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.gnome3.defaultIconTheme;
|
||||
defaultText = "pkgs.gnome3.defaultIconTheme";
|
||||
default = pkgs.gnome3.adwaita-icon-theme;
|
||||
defaultText = "pkgs.gnome3.adwaita-icon-theme";
|
||||
description = ''
|
||||
The package path that contains the icon theme given in the name option.
|
||||
'';
|
||||
@ -116,8 +116,8 @@ in
|
||||
cursorTheme = {
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.gnome3.defaultIconTheme;
|
||||
defaultText = "pkgs.gnome3.defaultIconTheme";
|
||||
default = pkgs.gnome3.adwaita-icon-theme;
|
||||
defaultText = "pkgs.gnome3.adwaita-icon-theme";
|
||||
description = ''
|
||||
The package path that contains the cursor theme given in the name option.
|
||||
'';
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gettext glib gtk3 libmowgli dbus-glib libxml2
|
||||
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
|
||||
xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2
|
||||
libpulseaudio fluidsynth libmad libogg libvorbis libcdio
|
||||
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
|
||||
libmodplug libsamplerate soxr lirc curl wavpack neon faad2
|
||||
|
||||
@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
|
||||
gtk3
|
||||
cairo
|
||||
gettext
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-good
|
||||
|
||||
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
|
||||
gsettings-desktop-schemas gnome3.defaultIconTheme
|
||||
gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
doCheck = false; # fails 1 out of 9 tests
|
||||
|
||||
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
python3
|
||||
gobject-introspection
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
|
||||
@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
pyGtkGlade
|
||||
];
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
propagatedBuildInputs = [ klick ];
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
curl gettext
|
||||
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
|
||||
gdl gnome3.defaultIconTheme gnome3.anjuta
|
||||
gdl gnome3.adwaita-icon-theme gnome3.anjuta
|
||||
] ++ (with perlPackages; [ perl XMLParser ]);
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = with gst_all_1; [
|
||||
gobject-introspection
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
|
||||
gnome3.defaultIconTheme ];
|
||||
gnome3.adwaita-icon-theme ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||
sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pyqt5
|
||||
|
||||
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
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 gobject-introspection ]
|
||||
buildInputs = [ gnome3.adwaita-icon-theme 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;
|
||||
[ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
gnome3.libpeas
|
||||
totem-pl-parser
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
|
||||
@ -19,7 +19,7 @@ in buildPythonApplication rec {
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
intltool wrapGAppsHook
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme
|
||||
glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
|
||||
gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
|
||||
buildInputs = [ gnome3.defaultIconTheme gtk libxml2
|
||||
buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
|
||||
enchant gucharmap python ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, wrapGAppsHook
|
||||
{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
|
||||
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
|
||||
let
|
||||
version = "3.30.2";
|
||||
@ -21,9 +21,9 @@ in stdenv.mkDerivation {
|
||||
intltool
|
||||
];
|
||||
|
||||
buildInputs = with gnome3; [
|
||||
buildInputs = [
|
||||
amtk
|
||||
defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gspell
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
|
||||
};
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
|
||||
libPath = stdenv.lib.makeLibraryPath (with xorg; [
|
||||
stdenv.cc.cc.lib
|
||||
gdk_pixbuf
|
||||
glib
|
||||
|
||||
@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
|
||||
sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
|
||||
};
|
||||
buildInputs = with pythonPackages; [ pytest responses ];
|
||||
checkInputs = with pythonPackages; [ pytest responses ];
|
||||
propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
|
||||
|
||||
disabled = pythonPackages.pythonOlder "3.3";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
|
||||
exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret,
|
||||
glib, gtk3, gsettings-desktop-schemas,
|
||||
libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison,
|
||||
flex, wrapGAppsHook, shared-mime-info }:
|
||||
|
||||
@ -16,10 +17,10 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];
|
||||
|
||||
buildInputs = with gnome3; [
|
||||
glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
|
||||
buildInputs = [
|
||||
glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
|
||||
exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain
|
||||
librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme
|
||||
librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
|
||||
libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
|
||||
libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
|
||||
gcr gnome3.defaultIconTheme libgdata
|
||||
gcr gnome3.adwaita-icon-theme libgdata
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
|
||||
, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
|
||||
, imagemagick, intltool, autoreconfHook, which, defaultIconTheme
|
||||
, imagemagick, intltool, autoreconfHook, which, gnome3
|
||||
}:
|
||||
|
||||
let
|
||||
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
|
||||
libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
|
||||
synfig which defaultIconTheme
|
||||
synfig which gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
|
||||
, hicolor-icon-theme, defaultIconTheme
|
||||
, hicolor-icon-theme, gnome3
|
||||
|
||||
# Test requirements
|
||||
, dbus, xvfb_run, xdotool
|
||||
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
|
||||
buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];
|
||||
buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ];
|
||||
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "electrum-ltc-${version}";
|
||||
pname = "electrum-ltc";
|
||||
version = "3.1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ pyqt5 ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyaes
|
||||
ecdsa
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
sqlite
|
||||
librsvg
|
||||
gnome3.gtk
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
patches = [ ./correct-post-install.patch ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
, glib
|
||||
, libsoup
|
||||
, gnome-online-accounts
|
||||
, rest
|
||||
, librest
|
||||
, json-glib
|
||||
, gnome-autoar
|
||||
, gspell
|
||||
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
|
||||
glib
|
||||
libsoup
|
||||
gnome-online-accounts
|
||||
rest
|
||||
librest
|
||||
json-glib
|
||||
gnome-autoar
|
||||
gspell
|
||||
|
||||
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ];
|
||||
buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.sh
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
buildInputs = [
|
||||
glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec {
|
||||
sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wafHook ];
|
||||
nativeBuildInputs = [ wafHook intltool ];
|
||||
buildInputs = [
|
||||
docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
|
||||
docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.13.3";
|
||||
name = "kitty-${version}";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -24,7 +24,7 @@ buildPythonApplication rec {
|
||||
wayland-protocols wayland dbus
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig which sphinx ];
|
||||
nativeBuildInputs = [ pkgconfig which sphinx ncurses ];
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
@ -36,7 +36,7 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
python3 setup.py linux-package
|
||||
${python.interpreter} setup.py linux-package
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -32,14 +32,17 @@ let
|
||||
"flask"
|
||||
"future"
|
||||
"futures"
|
||||
"monotonic"
|
||||
"pkginfo"
|
||||
"psutil"
|
||||
"pyserial"
|
||||
"python-dateutil"
|
||||
"requests"
|
||||
"rsa"
|
||||
"sarge"
|
||||
"scandir"
|
||||
"semantic_version"
|
||||
"watchdog"
|
||||
"websocket-client"
|
||||
"werkzeug"
|
||||
"wrapt"
|
||||
@ -47,13 +50,13 @@ let
|
||||
|
||||
in py.pkgs.buildPythonApplication rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.3.9";
|
||||
version = "1.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foosel";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
|
||||
sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
@ -75,7 +78,9 @@ in py.pkgs.buildPythonApplication rec {
|
||||
setup.py
|
||||
'';
|
||||
|
||||
checkPhase = "nosetests";
|
||||
checkPhase = ''
|
||||
HOME=$(mktemp -d) nosetests
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://octoprint.org/;
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
|
||||
};
|
||||
|
||||
buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
|
||||
buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
|
||||
|
||||
configureFlags = optional withGtk3 "--with-gtk=3";
|
||||
|
||||
@ -17,7 +17,7 @@ in buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gobject-introspection
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkgconfig, python3
|
||||
, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
|
||||
, gnome3, pantheon, gobject-introspection, wrapGAppsHook
|
||||
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
|
||||
}:
|
||||
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme
|
||||
gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas
|
||||
libgee gnome3.libsoup gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ dpkg wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ];
|
||||
buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ];
|
||||
|
||||
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
|
||||
|
||||
|
||||
@ -84,7 +84,7 @@ in stdenv.mkDerivation {
|
||||
gsettings-desktop-schemas glib gtk3
|
||||
|
||||
# needed for XDG_ICON_DIRS
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
outputs = ["out" "sandbox"];
|
||||
|
||||
@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
buildInputs = with gst_all_1; [
|
||||
glib-networking
|
||||
gobject-introspection
|
||||
gst-libav
|
||||
gst-plugins-base
|
||||
gst-plugins-ugly
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
, libgnome
|
||||
, libgnomeui
|
||||
, libnotify
|
||||
, defaultIconTheme
|
||||
, gnome3
|
||||
, libGLU_combined
|
||||
, nspr
|
||||
, nss
|
||||
@ -142,7 +142,7 @@ stdenv.mkDerivation {
|
||||
|
||||
inherit gtk3;
|
||||
|
||||
buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ];
|
||||
buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ];
|
||||
|
||||
# "strip" after "patchelf" may break binaries.
|
||||
# See: https://github.com/NixOS/patchelf/issues/10
|
||||
|
||||
@ -131,7 +131,7 @@ let
|
||||
--set GDK_BACKEND "wayland" \
|
||||
''}${lib.optionalString (browser ? gtk3)
|
||||
''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
|
||||
--suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
|
||||
''
|
||||
}
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
|
||||
gsettings-desktop-schemas glib gtk
|
||||
|
||||
# needed for XDG_ICON_DIRS
|
||||
gnome.defaultIconTheme
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr
|
||||
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
|
||||
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
|
||||
}:
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
|
||||
(libsoup.override { gnomeSupport = true; }) gnome3.libpeas
|
||||
(libsoup.override { gnomeSupport = true; }) libpeas
|
||||
glib-networking
|
||||
];
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
# Wrapper runtime
|
||||
, coreutils
|
||||
, glibcLocales
|
||||
, defaultIconTheme
|
||||
, gnome3
|
||||
, runtimeShell
|
||||
, shared-mime-info
|
||||
, gsettings-desktop-schemas
|
||||
@ -252,7 +252,7 @@ stdenv.mkDerivation rec {
|
||||
EOF
|
||||
|
||||
WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
|
||||
defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
shared-mime-info
|
||||
]}
|
||||
WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
|
||||
, appstream-glib, desktop-file-utils, wrapGAppsHook, curl, gnome3, gst_all_1
|
||||
, json-glib, libnotify, libsecret, sqlite, gumbo, glib, gtk3, libgee, libpeas
|
||||
, libsoup, librest, webkitgtk, gsettings-desktop-schemas, gdk_pixbuf, libxml2
|
||||
, hicolor-icon-theme
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala, gettext, python3
|
||||
, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
|
||||
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
|
||||
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -23,8 +22,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
curl glib json-glib libnotify libsecret sqlite gumbo gtk3
|
||||
libgee libpeas libsoup librest webkitgtk gsettings-desktop-schemas
|
||||
gdk_pixbuf gnome3.gnome-online-accounts hicolor-icon-theme
|
||||
libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas
|
||||
gnome3.gnome-online-accounts
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer gst-plugins-base gst-plugins-good
|
||||
]);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
|
||||
, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
|
||||
, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taxi";
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
pantheon.granite
|
||||
gnome3.libgee
|
||||
libgee
|
||||
gtk3
|
||||
libsecret
|
||||
libsoup
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
|
||||
cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }:
|
||||
cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "coyim-${version}";
|
||||
@ -14,7 +14,7 @@ buildGoPackage rec {
|
||||
sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "a safe and secure chat client";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
|
||||
, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
|
||||
, xorg, libXdmcp, libxkbcommon
|
||||
, libnotify, libsoup
|
||||
, libnotify, libsoup, libgee
|
||||
, libgcrypt
|
||||
, epoxy
|
||||
, at-spi2-core
|
||||
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
|
||||
gobject-introspection
|
||||
glib-networking
|
||||
glib
|
||||
gnome3.libgee
|
||||
gnome3.defaultIconTheme
|
||||
libgee
|
||||
gnome3.adwaita-icon-theme
|
||||
sqlite
|
||||
gdk_pixbuf
|
||||
gtk3
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
|
||||
evolution-data-server gnome-doc-utils avahi
|
||||
libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite
|
||||
gnome3.libsoup glib gnome3.defaultIconTheme boost
|
||||
gnome3.libsoup glib gnome3.adwaita-icon-theme boost
|
||||
autoreconfHook pkgconfig libxml2 unixODBC db nspr
|
||||
nss zlib libsecret libXrandr which libxslt libtasn1
|
||||
gmp nettle makeWrapper ]
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchurl, gettext, wrapGAppsHook
|
||||
|
||||
# Native dependencies
|
||||
, python3, gtk3, gobject-introspection, defaultIconTheme
|
||||
, python3, gtk3, gobject-introspection, gnome3
|
||||
|
||||
# Test dependencies
|
||||
, xvfb_run, dbus
|
||||
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection gtk3 defaultIconTheme
|
||||
gobject-introspection gtk3 gnome3.adwaita-icon-theme
|
||||
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
|
||||
++ lib.optional enableSecrets libsecret
|
||||
++ lib.optional enableSpelling gspell
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
|
||||
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
|
||||
, gtkmm3, libpeas, gsettings-desktop-schemas
|
||||
, makeWrapper, python3, python3Packages
|
||||
, vim ? vim_configurable.override {
|
||||
features = "normal";
|
||||
@ -21,10 +22,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
|
||||
python3 python3Packages.pygobject3
|
||||
notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
|
||||
glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);
|
||||
buildInputs = [
|
||||
gtkmm3 gmime3 webkitgtk libsass libpeas
|
||||
python3 python3Packages.pygobject3
|
||||
notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
glib-networking protobuf
|
||||
] ++ (if vim == null then [] else [ vim ]);
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
|
||||
|
||||
@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
|
||||
gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
, libcanberra-gtk2
|
||||
, libgnome
|
||||
, libgnomeui
|
||||
, defaultIconTheme
|
||||
, gnome3
|
||||
, libGLU_combined
|
||||
, nspr
|
||||
, nss
|
||||
@ -118,7 +118,7 @@ stdenv.mkDerivation {
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
buildInputs = [ gtk3 defaultIconTheme ];
|
||||
buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
|
||||
hunspell libevent libstartup_notification /* cairo */
|
||||
icu libpng jemalloc
|
||||
]
|
||||
++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ];
|
||||
++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
|
||||
|
||||
# from firefox + m4 + wrapperTool
|
||||
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
|
||||
, openssl, gsettings-desktop-schemas, json-glib
|
||||
# The themes here are soft dependencies; only icons are missing without them.
|
||||
, hicolor-icon-theme, adwaita-icon-theme
|
||||
, hicolor-icon-theme, gnome3
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
pcre libdbusmenu-gtk3 libappindicator-gtk3
|
||||
libvncserver libpthreadstubs libXdmcp libxkbcommon
|
||||
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
|
||||
openssl hicolor-icon-theme adwaita-icon-theme json-glib
|
||||
openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3, geocode-glib, json-glib, libsoup, webkitgtk, libappindicator, desktop-file-utils, hicolor-icon-theme, appstream, wrapGAppsHook }:
|
||||
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
|
||||
, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
|
||||
, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meteo";
|
||||
@ -23,6 +25,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
clutter
|
||||
clutter-gtk
|
||||
geocode-glib
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, fribidi
|
||||
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
|
||||
, boost, libxslt, goffice, wrapGAppsHook, iconTheme
|
||||
, boost, libxslt, goffice, wrapGAppsHook, gnome3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3 librsvg bzip2 fribidi libpng popt
|
||||
libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme
|
||||
libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
# ToDo: optional libgda, introspection?
|
||||
buildInputs = [
|
||||
goffice gtk3 gnome3.defaultIconTheme
|
||||
goffice gtk3 gnome3.adwaita-icon-theme
|
||||
python pygobject3
|
||||
] ++ (with perlPackages; [ perl XMLParser ]);
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
||||
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
|
||||
gnome3.defaultIconTheme ];
|
||||
gnome3.adwaita-icon-theme ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A personnal accounting application.";
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
||||
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
|
||||
gnome3.defaultIconTheme ];
|
||||
gnome3.adwaita-icon-theme ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Free, easy, personal accounting for everyone";
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
|
||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, defaultIconTheme, glib, ncurses, epoxy, gpgme
|
||||
, gnome3, glib, ncurses, epoxy, gpgme
|
||||
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
|
||||
, withHelp ? true
|
||||
, kdeIntegration ? false
|
||||
@ -277,7 +277,7 @@ in stdenv.mkDerivation rec {
|
||||
mdds bluez5 libcmis libwps libabw libzmf libtool
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
|
||||
librevenge libe-book libmwaw glm glew ncurses epoxy
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
|
||||
libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
|
||||
]
|
||||
++ lib.optional kdeIntegration kdelibs4;
|
||||
nativeBuildInputs = [ wrapGAppsHook gdb ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
|
||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, defaultIconTheme, glib, ncurses, epoxy, gpgme
|
||||
, gnome3, glib, ncurses, epoxy, gpgme
|
||||
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
|
||||
, withHelp ? true
|
||||
, kdeIntegration ? false
|
||||
@ -272,7 +272,7 @@ in stdenv.mkDerivation rec {
|
||||
mdds bluez5 libcmis libwps libabw libzmf libtool
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
|
||||
librevenge libe-book libmwaw glm glew ncurses epoxy
|
||||
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
|
||||
libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
|
||||
]
|
||||
++ lib.optional kdeIntegration kdelibs4;
|
||||
nativeBuildInputs = [ wrapGAppsHook gdb ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit (python3Packages.paperwork-backend) version src;
|
||||
name = "paperwork-${version}";
|
||||
pname = "paperwork";
|
||||
|
||||
sourceRoot = "source/paperwork-gtk";
|
||||
|
||||
# Patch out a few paths that assume that we're using the FHS:
|
||||
postPatch = ''
|
||||
themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)"
|
||||
themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)"
|
||||
sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py
|
||||
|
||||
sed -i -e 's,sys\.prefix,"",g' \
|
||||
@ -46,9 +46,9 @@ python3Packages.buildPythonApplication rec {
|
||||
paths = lib.collect lib.isDerivation aspellDicts;
|
||||
}}/lib/aspell";
|
||||
|
||||
checkInputs = [ xvfb_run dbus.daemon ];
|
||||
checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
|
||||
buildInputs = [
|
||||
gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg
|
||||
gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg
|
||||
];
|
||||
|
||||
# A few parts of chkdeps need to have a display and a dbus session, so we not
|
||||
|
||||
@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
atk
|
||||
gtk3
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
gtkspell3
|
||||
goocanvas2
|
||||
];
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
, gtk3
|
||||
, pantheon
|
||||
, gnome3
|
||||
, gtksourceview
|
||||
, libgee
|
||||
, cmake
|
||||
, libqalculate
|
||||
, gobject-introspection
|
||||
@ -35,8 +37,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
pantheon.elementary-icon-theme
|
||||
gnome3.gtksourceview
|
||||
gnome3.libgee
|
||||
gtksourceview
|
||||
libgee
|
||||
gnome3.libsoup
|
||||
pantheon.granite
|
||||
gtk3
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
|
||||
};
|
||||
|
||||
buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ];
|
||||
buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ];
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
|
||||
|
||||
|
||||
@ -1,22 +1,44 @@
|
||||
{ stdenv, python3, makeDesktopItem }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
|
||||
spyder-kernels = with python3.pkgs; buildPythonPackage rec {
|
||||
pname = "spyder-kernels";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
ipykernel
|
||||
wurlitzer
|
||||
];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Jupyter kernels for Spyder's console";
|
||||
homepage = https://github.com/spyder-ide/spyder-kernels;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "spyder";
|
||||
version = "3.2.8";
|
||||
version = "3.3.3";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
|
||||
sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
|
||||
};
|
||||
|
||||
# Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
|
||||
postPatch = ''
|
||||
sed -i -e '/pyqt5/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
|
||||
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
|
||||
jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
|
||||
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
|
||||
];
|
||||
|
||||
# There is no test for spyder
|
||||
|
||||
@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec {
|
||||
|
||||
buildInputs = [ git graphviz ];
|
||||
|
||||
checkInputs = [ git ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/git-big-picture \
|
||||
--prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs }
|
||||
|
||||
@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
intltool itstool libxml2 gobject-introspection wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
|
||||
gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
];
|
||||
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
|
||||
checkInputs = [ xvfb_run python3.pkgs.pytest dbus ];
|
||||
|
||||
@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec {
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
gnome3.gsettings-desktop-schemas libnotify
|
||||
gst-transcoder
|
||||
] ++ (with gst_all_1; [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, libX11
|
||||
, libXtst
|
||||
, wrapGAppsHook
|
||||
, defaultIconTheme
|
||||
, gnome3
|
||||
, hicolor-icon-theme
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
@ -39,7 +39,7 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
|
||||
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
|
||||
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
|
||||
pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which,
|
||||
pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which,
|
||||
withX ? true }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
|
||||
buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
|
||||
++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
|
||||
++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
|
||||
|
||||
patches = [ ./recognize_nixos.patch ];
|
||||
postPatch = ''
|
||||
|
||||
@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi
|
||||
[ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
|
||||
gsettings-desktop-schemas libosinfo gtk3
|
||||
] ++ optional spiceSupport spice-gtk;
|
||||
|
||||
|
||||
@ -196,4 +196,5 @@ in stdenv.mkDerivation {
|
||||
${if isMultiBuild then extraBuildCommandsMulti else ""}
|
||||
'';
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
}
|
||||
|
||||
@ -26,6 +26,13 @@ sub isInPathsToLink {
|
||||
return 0;
|
||||
}
|
||||
|
||||
# Similar to `lib.isStorePath`
|
||||
sub isStorePath {
|
||||
my $path = shift;
|
||||
my $storePath = "@storeDir@";
|
||||
|
||||
return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath;
|
||||
}
|
||||
|
||||
# For each activated package, determine what symlinks to create.
|
||||
|
||||
@ -84,6 +91,11 @@ sub checkCollision {
|
||||
sub findFiles {
|
||||
my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
|
||||
|
||||
# The store path must not be a file
|
||||
if (-f $target && isStorePath $target) {
|
||||
die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
|
||||
}
|
||||
|
||||
# Urgh, hacky...
|
||||
return if
|
||||
$relName eq "/propagated-build-inputs" ||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# a fork of the buildEnv in the Nix distribution. Most changes should
|
||||
# eventually be merged back into the Nix distribution.
|
||||
|
||||
{ buildPackages, runCommand, lib }:
|
||||
{ buildPackages, runCommand, lib, substituteAll }:
|
||||
|
||||
lib.makeOverridable
|
||||
({ name
|
||||
@ -43,6 +43,13 @@ lib.makeOverridable
|
||||
, meta ? {}
|
||||
}:
|
||||
|
||||
let
|
||||
builder = substituteAll {
|
||||
src = ./builder.pl;
|
||||
inherit (builtins) storeDir;
|
||||
};
|
||||
in
|
||||
|
||||
runCommand name
|
||||
rec {
|
||||
inherit manifest ignoreCollisions checkCollisionContents passthru
|
||||
@ -63,10 +70,11 @@ runCommand name
|
||||
priority = drv.meta.priority or 5;
|
||||
}) paths);
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
# XXX: The size is somewhat arbitrary
|
||||
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
|
||||
}
|
||||
''
|
||||
${buildPackages.perl}/bin/perl -w ${./builder.pl}
|
||||
${buildPackages.perl}/bin/perl -w ${builder}
|
||||
eval "$postBuild"
|
||||
'')
|
||||
|
||||
@ -22,4 +22,5 @@ stdenv.mkDerivation ({
|
||||
eval "$postInstall"
|
||||
'';
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
} // args)
|
||||
|
||||
@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({
|
||||
builder = ./substitute-all.sh;
|
||||
inherit (args) src;
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
} // args)
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gtk3 libxml2 python3Packages.python python3Packages.pyatspi
|
||||
python3Packages.pygobject3 python3Packages.ipython
|
||||
at-spi2-core dbus libwnck3 gnome3.defaultIconTheme
|
||||
at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
wrapPrefixVariables = [ "PYTHONPATH" ];
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
|
||||
, pkgconfig, gtk3, glib, libnotify, gtkspell3
|
||||
, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server
|
||||
, adwaita-icon-theme, gnome-desktop, libgdata
|
||||
, libgweather, glib-networking, gsettings-desktop-schemas
|
||||
, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite
|
||||
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
|
||||
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
|
||||
@ -14,17 +16,17 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
|
||||
propagatedUserEnvPkgs = [ evolution-data-server ];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
|
||||
gnome3.evolution-data-server libsecret libical gcr
|
||||
webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3
|
||||
libcanberra-gtk3 bogofilter gnome3.libgdata sqlite
|
||||
gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu
|
||||
evolution-data-server libsecret libical gcr
|
||||
webkitgtk shared-mime-info gnome-desktop gtkspell3
|
||||
libcanberra-gtk3 bogofilter libgdata sqlite
|
||||
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
|
||||
nss nspr libnotify procps highlight gnome3.libgweather
|
||||
gnome3.gsettings-desktop-schemas
|
||||
gnome3.glib-networking openldap
|
||||
nss nspr libnotify procps highlight libgweather
|
||||
gsettings-desktop-schemas
|
||||
glib-networking openldap
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
|
||||
{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
|
||||
, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
|
||||
|
||||
buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
|
||||
buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ];
|
||||
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, intltool, fetchurl
|
||||
, pkgconfig, gtk3, glib
|
||||
, pkgconfig, gtk3, glib, adwaita-icon-theme
|
||||
, libpeas, gtksourceview, gsettings-desktop-schemas
|
||||
, wrapGAppsHook, itstool, libsoup, libxml2
|
||||
, gnome3, gspell }:
|
||||
|
||||
@ -16,9 +17,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3 glib
|
||||
gnome3.defaultIconTheme libsoup
|
||||
gnome3.libpeas gnome3.gtksourceview
|
||||
gnome3.gsettings-desktop-schemas gspell
|
||||
adwaita-icon-theme libsoup
|
||||
libpeas gtksourceview
|
||||
gsettings-desktop-schemas gspell
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2,
|
||||
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3,
|
||||
wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; };
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ gnome3.gtk intltool itstool libxml2 ];
|
||||
buildInputs = [ gtk3 intltool itstool libxml2 ];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = "ghex";
|
||||
attrPath = "gnome3.ghex";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Ghex;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gtk3 glib libxml2 python3 python3.pkgs.pygobject3
|
||||
gnome3.gsettings-desktop-schemas
|
||||
gdk_pixbuf gnome3.defaultIconTheme
|
||||
gdk_pixbuf gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
|
||||
libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
|
||||
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
|
||||
tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
|
||||
gnome3.defaultIconTheme librsvg acl libgudev libsecret
|
||||
gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
|
||||
libcap_ng numactl xen libapparmor
|
||||
];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
|
||||
, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
|
||||
, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
|
||||
, glib, gnome-online-accounts, gsettings-desktop-schemas }:
|
||||
|
||||
let
|
||||
@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
|
||||
buildInputs = [
|
||||
gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
|
||||
gsettings-desktop-schemas gnome3.defaultIconTheme
|
||||
gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
|
||||
gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
|
||||
, gobject-introspection, gjs, libunistring }:
|
||||
, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-characters-${version}";
|
||||
@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ];
|
||||
buildInputs = [
|
||||
glib gtk3 gjs pango gnome3.gsettings-desktop-schemas
|
||||
gnome3.defaultIconTheme libunistring
|
||||
glib gtk3 gjs pango gsettings-desktop-schemas
|
||||
adwaita-icon-theme libunistring
|
||||
# typelib
|
||||
gnome3.gnome-desktop
|
||||
gnome-desktop
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, fetchurl
|
||||
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
|
||||
, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
|
||||
, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
|
||||
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
|
||||
gobject-introspection # for finding vapi files
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme
|
||||
gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
|
||||
gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme
|
||||
gnome-desktop geocode-glib geoclue2 libgweather gsound
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3 glib gnome3.gsettings-desktop-schemas
|
||||
gdk_pixbuf gnome3.defaultIconTheme evince
|
||||
gdk_pixbuf gnome3.adwaita-icon-theme evince
|
||||
libsoup webkitgtk gjs gobject-introspection
|
||||
tracker tracker-miners libgdata
|
||||
gnome-desktop libzapojit libgepub
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
|
||||
libxml2 libxslt docbook_xsl docbook_xml_dtd_43
|
||||
];
|
||||
buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
|
||||
buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
|
||||
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
|
||||
geocode-glib libchamplain libsoup
|
||||
gdk_pixbuf librsvg libgweather
|
||||
gnome3.gsettings-desktop-schemas evolution-data-server
|
||||
gnome-online-accounts gnome3.defaultIconTheme
|
||||
gnome-online-accounts gnome3.adwaita-icon-theme
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
|
||||
@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
|
||||
buildInputs = with gst_all_1; [
|
||||
gtk3 glib libmediaart gnome-online-accounts
|
||||
gdk_pixbuf gnome3.defaultIconTheme python3
|
||||
gtk3 glib libmediaart gnome-online-accounts gobject-introspection
|
||||
gdk_pixbuf gnome3.adwaita-icon-theme python3
|
||||
grilo grilo-plugins libnotify libdazzle libsoup
|
||||
gnome3.gsettings-desktop-schemas tracker
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
gtk3 wrapGAppsHook libgtop intltool itstool libxml2
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ nmap inetutils ];
|
||||
|
||||
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
||||
gnome3.gnome-online-accounts zeitgeist
|
||||
gnome3.gsettings-desktop-schemas
|
||||
evolution-data-server
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gtk3 glib gegl babl libgdata libdazzle
|
||||
gnome3.gsettings-desktop-schemas
|
||||
gdk_pixbuf gnome3.defaultIconTheme
|
||||
gdk_pixbuf gnome3.adwaita-icon-theme
|
||||
gfbgraph grilo-plugins grilo
|
||||
gnome-online-accounts tracker
|
||||
gexiv2 geocode-glib dleyna-renderer
|
||||
|
||||
@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
glib
|
||||
upower
|
||||
gnome3.defaultIconTheme
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
|
||||
, gettext, gnome3, glib, gtk, libpeas
|
||||
, gettext, gnome3, glib, gtk3, libpeas
|
||||
, gnome-online-accounts, gsettings-desktop-schemas
|
||||
, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }:
|
||||
, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }:
|
||||
|
||||
let
|
||||
pname = "gnome-todo";
|
||||
@ -18,11 +18,11 @@ in stdenv.mkDerivation rec {
|
||||
meson ninja pkgconfig gettext python3 wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
glib gtk libpeas gnome-online-accounts
|
||||
gsettings-desktop-schemas gnome3.defaultIconTheme
|
||||
glib gtk3 libpeas gnome-online-accounts
|
||||
gsettings-desktop-schemas gnome3.adwaita-icon-theme
|
||||
# Plug-ins
|
||||
evolution-data-server libxml2 libsoup libical
|
||||
rest json-glib
|
||||
librest json-glib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
gtk3 gjs gobject-introspection gnome-desktop
|
||||
libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas
|
||||
libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
# The .service file isn't wrapped with the correct environment
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gtk3 glib gcr
|
||||
gnome3.gsettings-desktop-schemas gnupg
|
||||
gnome3.defaultIconTheme gpgme
|
||||
gnome3.adwaita-icon-theme gpgme
|
||||
libsecret avahi libsoup p11-kit
|
||||
openssh openldap
|
||||
];
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg
|
||||
gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user