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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt
2021-05-08 14:43:43 +02:00
parent 0388b1a029 b28f0d640f
commit 9651084620
657 changed files with 2572 additions and 1628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/accessibility/mousetweaks/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config
, glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook
, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook
, libX11, libXtst, libXfixes, libXcursor
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
pkgs/applications/accessibility/squeekboard/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, meson
, ninja
, pkg-config
, gnome3
, gnome
, glib
, gtk3
, wayland
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
gnome3.gnome-desktop
gnome.gnome-desktop
wayland
wayland-protocols
libxml2
pkgs/applications/audio/cadence/default.nix
+1 -1
View File
@@ -98,7 +98,7 @@ mkDerivation rec {
homepage = "https://github.com/falkTX/Cadence/";
description = "Collection of tools useful for audio production";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ worldofpeace ];
maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/applications/audio/cozy-audiobooks/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
, file
, cairo
, gettext
, gnome3
, gnome
}:
python3Packages.buildPythonApplication rec {
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
gtk3
cairo
gettext
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
] ++ (with gst_all_1; [
gstreamer
gst-plugins-good
pkgs/applications/audio/easytag/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas
, gnome3, wrapGAppsHook
, gnome, wrapGAppsHook
}:
let
@@ -19,13 +19,13 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
gsettings-desktop-schemas gnome3.adwaita-icon-theme
gsettings-desktop-schemas gnome.adwaita-icon-theme
];
doCheck = false; # fails 1 out of 9 tests
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/applications/audio/gpodder/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, python3, python3Packages, intltool
, glibcLocales, gnome3, gtk3, wrapGAppsHook
, glibcLocales, gnome, gtk3, wrapGAppsHook
, gobject-introspection
}:
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
python3
gobject-introspection
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
];
checkInputs = with python3Packages; [
pkgs/applications/audio/gtkpod/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
libvorbis, gdk-pixbuf }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf
gdl gnome3.adwaita-icon-theme gnome3.anjuta
gdl gnome.adwaita-icon-theme gnome.anjuta
] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = ''
pkgs/applications/audio/guitarix/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
, glib
, glib-networking
, glibmm
, gnome3
, gnome
, gsettings-desktop-schemas
, gtk3
, gtkmm3
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
glib
glib-networking.out
glibmm
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gsettings-desktop-schemas
gtk3
gtkmm3
pkgs/applications/audio/helio-workstation/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3
, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome
, pkg-config, makeWrapper
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr
xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity
xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity
];
nativeBuildInputs = [ pkg-config makeWrapper ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
install -Dm755 build/Helio $out/bin
wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin
wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome.zenity}/bin
mkdir -p $out/share
cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share
pkgs/applications/audio/kapitonov-plugins-pack/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config
, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm
, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm
, zita-convolver, zita-resampler
}:
pkgs/applications/audio/lollypop/default.nix
+1 -1
View File
@@ -106,7 +106,7 @@ python3.pkgs.buildPythonApplication rec {
description = "A modern music player for GNOME";
homepage = "https://wiki.gnome.org/Apps/Lollypop";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace lovesegfault ];
maintainers = with maintainers; [ lovesegfault ];
platforms = platforms.linux;
};
}
pkgs/applications/audio/miniaudicle/default.nix
+59
View File
@@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchurl
, bison
, flex
, which
, alsaLib
, libsndfile
, qt4
, qscintilla
, libpulseaudio
, libjack2
, audioBackend ? "pulse" # "pulse", "alsa", or "jack"
}:
stdenv.mkDerivation rec {
pname = "miniaudicle";
version = "1.3.5.2";
src = fetchurl {
url = "https://audicle.cs.princeton.edu/mini/release/files/miniAudicle-${version}.tgz";
hash = "sha256-dakDz69uHbKZFj8z67CubmRXEQ5X6GuYqlCXXvLzqSI=";
};
sourceRoot = "miniAudicle-${version}/src";
postPatch = ''
substituteInPlace miniAudicle.pro \
--replace "/usr/local" $out
'';
nativeBuildInputs = [
bison
flex
which
];
buildInputs = [
alsaLib
libsndfile
qt4
qscintilla
] ++ lib.optional (audioBackend == "pulse") libpulseaudio
++ lib.optional (audioBackend == "jack") libjack2;
buildFlags = [ "linux-${audioBackend}" ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A light-weight integrated development environment for the ChucK digital audio programming language";
homepage = "https://audicle.cs.princeton.edu/mini/";
downloadPage = "https://audicle.cs.princeton.edu/mini/linux/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
broken = stdenv.isDarwin; # not attempted
};
}
pkgs/applications/audio/pavucontrol/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio,
gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }:
gtkmm3 , libcanberra-gtk3, gnome, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "pavucontrol";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
})];
buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3
gnome3.adwaita-icon-theme ];
gnome.adwaita-icon-theme ];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
pkgs/applications/audio/pithos/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection
, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection
, libnotify, libsecret, gst_all_1 }:
pythonPackages.buildPythonApplication rec {
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ];
propagatedBuildInputs =
[ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++
[ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++
(with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++
(with pythonPackages; [ pygobject3 pylast ]);
pkgs/applications/audio/quodlibet/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg,
{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
gst_all_1, withGstPlugins ? true,
xineBackend ? false, xine-lib,
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]);
buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xine-lib ] else with gst_all_1;
[ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
pkgs/applications/audio/rhythmbox/default.nix
+3 -3
View File
@@ -6,7 +6,7 @@
, intltool
, libpeas
, libsoup
, gnome3
, gnome
, totem-pl-parser
, tdb
, json-glib
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
gtk3
libpeas
totem-pl-parser
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/applications/audio/sfizz/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, libjack2, libsndfile, xorg, freetype, libxkbcommon
, cairo, glib, gnome3, flac, libogg, libvorbis, libopus
, cairo, glib, gnome, flac, libogg, libvorbis, libopus
, cmake, pkg-config
}:
@@ -35,14 +35,14 @@ stdenv.mkDerivation rec {
libxkbcommon
cairo
glib
gnome3.zenity
gnome.zenity
freetype
];
nativeBuildInputs = [ cmake pkg-config ];
postPatch = ''
substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \
--replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity'
--replace '"/usr/bin/zenity' '"${gnome.zenity}/bin/zenity'
'';
cmakeFlags = [
pkgs/applications/audio/sonata/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, wrapGAppsHook, gettext
, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
@@ -24,7 +24,7 @@ in buildPythonApplication rec {
buildInputs = [
glib
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gsettings-desktop-schemas
gtk3
gdk-pixbuf
pkgs/applications/audio/sound-juicer/default.nix
+3 -3
View File
@@ -10,7 +10,7 @@
, libxml2
, brasero
, libcanberra-gtk3
, gnome3
, gnome
, gst_all_1
, libmusicbrainz5
, libdiscid
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
gtk3
brasero
libcanberra-gtk3
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gsettings-desktop-schemas
libmusicbrainz5
libdiscid
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
pkgs/applications/audio/spotify/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
}:
@@ -139,7 +139,7 @@ stdenv.mkDerivation {
librarypath="${lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \
--prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome3.zenity}/bin"
--prefix PATH : "${gnome.zenity}/bin"
# fix Icon line in the desktop file (#48062)
sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"
pkgs/applications/audio/vocal/default.nix
+1 -1
View File
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/needle-and-thread/vocal";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/display-managers/lightdm/default.nix
+3 -3
View File
@@ -20,7 +20,7 @@
, polkit
, accountsservice
, gtk-doc
, gnome3
, gnome
, gobject-introspection
, vala
, fetchpatch
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
autoconf
automake
yelp-tools
gnome3.yelp-xsl
gnome.yelp-xsl
gobject-introspection
gtk-doc
intltool
@@ -142,6 +142,6 @@ stdenv.mkDerivation rec {
description = "A cross-desktop display manager";
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/editors/apostrophe/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake
, wrapGAppsHook, pkg-config, desktop-file-utils
, appstream-glib, pythonPackages, glib, gobject-introspection
, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive
, shared-mime-info, libhandy
}:
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
appstream-glib wrapGAppsHook ];
buildInputs = [ glib pythonEnv gobject-introspection gtk3
gnome3.adwaita-icon-theme webkitgtk gspell texlive
gnome.adwaita-icon-theme webkitgtk gspell texlive
glib-networking libhandy ];
postPatch = ''
pkgs/applications/editors/bluefish/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2
, enchant, gucharmap, python3, gnome3
, enchant, gucharmap, python3, gnome
}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ];
buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
buildInputs = [ gnome.adwaita-icon-theme gtk libxml2
enchant gucharmap python3 ];
meta = with lib; {
pkgs/applications/editors/gnome-builder/default.nix
+3 -3
View File
@@ -6,7 +6,7 @@
, docbook_xml_dtd_43
, fetchurl
, flatpak
, gnome3
, gnome
, libgit2-glib
, gobject-introspection
, glade
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ctags
flatpak
gnome3.devhelp
gnome.devhelp
glade
libgit2-glib
libpeas
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
done
'';
passthru.updateScript = gnome3.updateScript {
passthru.updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
pkgs/applications/editors/gnome-latex/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@
, libgee
, tepl
, amtk
, gnome3
, gnome
, glib
, pkg-config
, intltool
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
buildInputs = [
amtk
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
glib
gsettings-desktop-schemas
gspell
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
passthru.updateScript = gnome3.updateScript {
passthru.updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
pkgs/applications/editors/gobby/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ avahiSupport ? false # build support for Avahi in libinfinity
, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }:
let
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
pkgs/applications/graphics/avocode/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, makeDesktopItem, fetchurl, unzip
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa
}:
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [makeWrapper wrapGAppsHook unzip];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder
pkgs/applications/graphics/darktable/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome
, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif
libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
libsoup graphicsmagick json-glib openjpeg lua pugixml
libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes
libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes
] ++ lib.optionals stdenv.isLinux [
colord colord-gtk libX11 ocl-icd
] ++ lib.optional stdenv.isDarwin gtk-mac-integration
pkgs/applications/graphics/fondo/default.nix
+1 -1
View File
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
description = "Find the most beautiful wallpapers for your desktop";
homepage = "https://github.com/calo001/fondo";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/graphics/gimp/wrapper.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}:
{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}:
let
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
@@ -18,7 +18,7 @@ in symlinkJoin {
wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
--set GIMP2_DATADIR "$out/share/gimp/2.0" \
--prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
--prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \
${toString extraArgs}
done
set +x
pkgs/applications/graphics/glabels/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook
{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkg-config, yelp-tools
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc yelp-tools
gnome3.gnome-common gsettings-desktop-schemas
gnome.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/applications/graphics/glimpse/wrapper.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }:
{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }:
let
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins);
@@ -19,7 +19,7 @@ symlinkJoin {
wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \
--set GIMP2_DATADIR "$out/share/glimpse/2.0" \
--prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
--prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \
${toString extraArgs}
done
pkgs/applications/graphics/gnome-photos/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@
, gfbgraph
, glib
, gnome-online-accounts
, gnome3
, gnome
, gobject-introspection
, grilo
, grilo-plugins
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
gfbgraph
glib
gnome-online-accounts
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
grilo
grilo-plugins
gsettings-desktop-schemas
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
pkgs/applications/graphics/gthumb/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, gnome3
, gnome
, pkg-config
, meson
, ninja
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
clutter-gtk
exiv2
glib
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
pkgs/applications/graphics/kgraphviewer/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ mkDerivation rec {
meta = with lib; {
description = "A Graphviz dot graph viewer for KDE";
license = licenses.gpl2;
maintainers = with maintainers; [ lethalman ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/graphics/megapixels/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
, pkg-config
, wrapGAppsHook
, gtk3
, gnome3
, gnome
, zbar
, tiffSupport ? true
, libraw
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ]
buildInputs = [ gtk3 gnome.adwaita-icon-theme zbar ]
++ optional tiffSupport libraw
++ optional jpgSupport graphicsmagick;
pkgs/applications/graphics/ocrfeeder/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@
, intltool
, itstool
, libxml2
, gnome3
, gnome
, python3
, gobject-introspection
, wrapGAppsHook
pkgs/applications/graphics/shotwell/default.nix
+3 -3
View File
@@ -12,7 +12,7 @@
, sqlite
, webkitgtk
, pkg-config
, gnome3
, gnome
, gst_all_1
, libgudev
, libraw
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
librsvg
librest
gcr
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
libgdata
libchamplain
libsecret
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/applications/graphics/synfigstudio/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config
, imagemagick, intltool, autoreconfHook, which, gnome3
, imagemagick, intltool, autoreconfHook, which, gnome
}:
let
@@ -107,7 +107,7 @@ stdenv.mkDerivation {
buildInputs = [
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
synfig which gnome3.adwaita-icon-theme
synfig which gnome.adwaita-icon-theme
];
postInstall = ''
pkgs/applications/graphics/tev/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake, wrapGAppsHook
, libX11, libzip, glfw, libpng, xorg, gnome3
, libX11, libzip, glfw, libpng, xorg, gnome
}:
stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/tev \
"''${gappsWrapperArgs[@]}" \
--prefix PATH ":" "${gnome3.zenity}/bin"
--prefix PATH ":" "${gnome.zenity}/bin"
'';
meta = with lib; {
pkgs/applications/graphics/vimiv/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
, gnome3
, gnome
# Test requirements
, dbus, xvfb_run, xdotool
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
buildInputs = [ gnome3.adwaita-icon-theme librsvg ];
buildInputs = [ gnome.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [
pkgs/applications/misc/almanah/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
, gcr
, gettext
, glib
, gnome3
, gnome
, gpgme
, gtk3
, gtksourceview3
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none"; # it is quite odd
};
pkgs/applications/misc/dwmblocks/default.nix
+1 -1
View File
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/torrinfail/dwmblocks";
license = licenses.isc;
maintainers = with maintainers; [ sophrosyne ];
platforms = platforms.all;
platforms = platforms.linux;
};
}
pkgs/applications/misc/font-manager/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
, vala
, gsettings-desktop-schemas
, gtk3
, gnome3
, gnome
, desktop-file-utils
, wrapGAppsHook
, gobject-introspection
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
sqlite
gsettings-desktop-schemas # for font settings
gtk3
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
libsoup
glib-networking # for SSL so that Google Fonts can load
webkitgtk
pkgs/applications/misc/gksu/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu,
{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu,
intltool, libstartup_notification, gtk-doc, wrapGAppsHook
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring
gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring
];
propagatedBuildInputs = [
pkgs/applications/misc/gnome-multi-writer/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, desktop-file-utils
, gettext
, glib
, gnome3
, gnome
, gtk3
, gusb
, libcanberra-gtk3
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
pkgs/applications/misc/gnome-recipes/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, meson
, ninja
, pkg-config
, gnome3
, gnome
, desktop-file-utils
, gettext
, itstool
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
pkgs/applications/misc/gnome-usage/default.nix
+3 -3
View File
@@ -12,7 +12,7 @@
, gtk3
, libgtop
, libdazzle
, gnome3
, gnome
, tracker
, libhandy
}:
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gtk3
libdazzle
libgtop
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
pkgs/applications/misc/gpx-viewer/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "gpx-viewer";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
intltool pkg-config
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
];
buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ];
buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ];
meta = with lib; {
homepage = "https://blog.sarine.nl/tag/gpxviewer/";
pkgs/applications/misc/gummi/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, pkgs
, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive
, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive
, pkg-config, intltool, autoreconfHook, wrapGAppsHook
}:
pkgs/applications/misc/lutris/fhsenv.nix
+2 -2
View File
@@ -5,7 +5,7 @@
let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ];
gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ];
xorgDeps = pkgs: with pkgs.xorg; [
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
@@ -86,7 +86,7 @@ in buildFHSUserEnv {
# ZDOOM
soundfont-fluid bzip2 game-music-emu
] ++ qt5Deps pkgs
++ gnome3Deps pkgs
++ gnomeDeps pkgs
++ lib.optional steamSupport pkgs.steam;
multiPkgs = pkgs: with pkgs; [
pkgs/applications/misc/notejot/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
description = "Stupidly-simple sticky notes applet";
homepage = "https://github.com/lainsce/notejot";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/misc/notify-osd-customizable/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, dbus-glib
, fetchurl
, glib
, gnome3
, gnome
, libnotify
, libtool
, libwnck3
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper
gsettings-desktop-schemas gnome3.gnome-common
gsettings-desktop-schemas gnome.gnome-common
libtool
];
pkgs/applications/misc/olifant/default.nix
+3 -3
View File
@@ -9,7 +9,7 @@
, python3
, libgee
, gsettings-desktop-schemas
, gnome3
, gnome
, pantheon
, wrapGAppsHook
, gtk3
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
glib-networking
gnome3.libsoup
gnome.libsoup
gsettings-desktop-schemas
gtk3
json-glib
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey";
homepage = "https://github.com/cleac/olifant";
license = licenses.gpl3;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/misc/orca/default.nix
+3 -3
View File
@@ -12,7 +12,7 @@
, python
, pygobject3
, gtk3
, gnome3
, gnome
, substituteAll
, at-spi2-atk
, at-spi2-core
@@ -92,7 +92,7 @@ buildPythonApplication rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};
@@ -108,7 +108,7 @@ buildPythonApplication rec {
GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and
WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued.
Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`.
Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`.
'';
maintainers = with maintainers; [ berce ] ++ teams.gnome.members;
license = licenses.lgpl21;
pkgs/applications/misc/pcmanfm/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config
, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }:
, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }:
let
libfm' = libfm.override { inherit withGtk3; };
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
};
buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ];
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
configureFlags = optional withGtk3 "--with-gtk=3";
pkgs/applications/misc/phoc/default.nix
+3 -3
View File
@@ -8,7 +8,7 @@
, python3
, wrapGAppsHook
, libinput
, gnome3
, gnome
, glib
, gtk3
, wayland
@@ -60,9 +60,9 @@ in stdenv.mkDerivation rec {
libinput
glib
gtk3
gnome3.gnome-desktop
gnome.gnome-desktop
# For keybindings settings schemas
gnome3.mutter
gnome.mutter
wayland
phocWlroots
];
pkgs/applications/misc/plank/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, cairo
, dconf
, glib
, gnome3
, gnome
, gtk3
, libwnck3
, libX11
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
gettext
gnome3.gnome-common
gnome.gnome-common
libxml2 # xmllint
pkg-config
vala
pkgs/applications/misc/pytrainer/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, python3
, fetchFromGitHub
, gdk-pixbuf
, gnome3
, gnome
, gpsbabel
, glib-networking
, glibcLocales
@@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec {
gtk3
webkitgtk
glib-networking
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gdk-pixbuf
];
pkgs/applications/misc/safeeyes/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
}:
let inherit (python3Packages) python buildPythonApplication fetchPypi croniter;
@@ -16,8 +16,8 @@ in buildPythonApplication rec {
buildInputs = [
gtk3
gobject-introspection
gnome3.adwaita-icon-theme
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gnome.adwaita-icon-theme
];
nativeBuildInputs = [
pkgs/applications/misc/snapper-gui/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, python3, python3Packages
, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper
, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper
, gobject-introspection
}:
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
python3
gobject-introspection
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
];
doCheck = false; # it doesn't have any tests
pkgs/applications/misc/tootle/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
, python3
, libgee
, gsettings-desktop-schemas
, gnome3
, gnome
, pantheon
, wrapGAppsHook
, gtk3
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
glib-networking
gnome3.libsoup
gnome.libsoup
gsettings-desktop-schemas
gtk3
json-glib
pkgs/applications/misc/ulauncher/default.nix
+3 -3
View File
@@ -4,7 +4,7 @@
, python3Packages
, gdk-pixbuf
, glib
, gnome3
, gnome
, gobject-introspection
, gtk3
, wrapGAppsHook
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
gdk-pixbuf
glib
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gobject-introspection
gtk3
keybinder3
@@ -115,6 +115,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://ulauncher.io/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ aaronjanse worldofpeace ];
maintainers = with maintainers; [ aaronjanse ];
};
}
pkgs/applications/networking/browsers/brave/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
, gdk-pixbuf
, glib
, gnome2
, gnome3
, gnome
, gsettings-desktop-schemas
, gtk3
, libpulseaudio
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ dpkg wrapGAppsHook ];
buildInputs = [ glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ];
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
pkgs/applications/networking/browsers/chromium/common.nix
+2 -2
View File
@@ -26,7 +26,7 @@
, libgcrypt ? null # gnomeSupport || cupsSupport
# package customization
, gnomeSupport ? false, gnome ? null
, gnomeSupport ? false, gnome2 ? null
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
, proprietaryCodecs ? true
, cupsSupport ? true
@@ -158,7 +158,7 @@ let
libdrm wayland mesa.drivers libxkbcommon
curl
] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio;
pkgs/applications/networking/browsers/chromium/default.nix
+4 -4
View File
@@ -1,6 +1,6 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
, pipewire
, gcc, nspr, nss, runCommand
@@ -9,7 +9,7 @@
# package customization
# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
, channel ? "stable"
, gnomeSupport ? false, gnome ? null
, gnomeSupport ? false, gnome2 ? null
, gnomeKeyringSupport ? false
, proprietaryCodecs ? true
, enableWideVine ? false
@@ -31,7 +31,7 @@ let
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
mkChromiumDerivation = callPackage ./common.nix ({
inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs
cupsSupport pulseSupport ungoogled;
gnChromium = gn.overrideAttrs (oldAttrs: {
inherit (upstream-info.deps.gn) version;
@@ -156,7 +156,7 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
];
outputs = ["out" "sandbox"];
pkgs/applications/networking/browsers/eolie/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script
, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
, glib-networking, gtkspell3, hunspell, desktop-file-utils
, gobject-introspection, wrapGAppsHook, gnome3 }:
, gobject-introspection, wrapGAppsHook, gnome }:
python3.pkgs.buildPythonApplication rec {
pname = "eolie";
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-base
gst-plugins-ugly
gstreamer
gnome3.gnome-settings-daemon
gnome.gnome-settings-daemon
gtk3
gtkspell3
hunspell
@@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec {
description = "A new GNOME web browser";
homepage = "https://wiki.gnome.org/Apps/Eolie";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ samdroid-apps worldofpeace ];
maintainers = with maintainers; [ samdroid-apps ];
platforms = platforms.linux;
};
}
pkgs/applications/networking/browsers/firefox-bin/default.nix
+2 -2
View File
@@ -28,7 +28,7 @@
, libXt
, libcanberra
, libnotify
, gnome3
, gnome
, libGLU, libGL
, nspr
, nss
@@ -139,7 +139,7 @@ stdenv.mkDerivation {
inherit gtk3;
buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ];
buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ];
# "strip" after "patchelf" may break binaries.
# See: https://github.com/NixOS/patchelf/issues/10
pkgs/applications/networking/browsers/firefox/wrapper.nix
+2 -2
View File
@@ -3,7 +3,7 @@
## various stuff that can be plugged in
, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify
, gnome3/*.gnome-shell*/
, gnome/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
, tridactyl-native
, fx_cast_bridge
@@ -269,7 +269,7 @@ let
--set MOZ_ENABLE_WAYLAND "1" \
''}${lib.optionalString (browser ? gtk3)
''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
--suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share'
''
}
#############################
pkgs/applications/networking/browsers/google-chrome/default.nix
+2 -2
View File
@@ -38,7 +38,7 @@
, chromium
, gsettings-desktop-schemas
, gnome3
, gnome
# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder)
, libvaSupport ? true, libva
@@ -88,7 +88,7 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
];
unpackPhase = ''
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+2 -2
View File
@@ -36,7 +36,7 @@
# Wrapper runtime
, coreutils
, glibcLocales
, gnome3
, gnome
, runtimeShell
, shared-mime-info
, gsettings-desktop-schemas
@@ -246,7 +246,7 @@ stdenv.mkDerivation rec {
"${graphene-hardened-malloc}/lib/libhardened_malloc.so"}
WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
shared-mime-info
]}
WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
pkgs/applications/networking/dropbox/cli.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, python3
, dropbox
, gtk3
, gnome3
, gnome
, gdk-pixbuf
, gobject-introspection
}:
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
buildInputs = [
python3
gtk3
gnome3.nautilus
gnome.nautilus
];
configureFlags = [
pkgs/applications/networking/feedreaders/feedreader/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl glib json-glib libnotify libsecret sqlite gumbo gtk3
libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas
libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas
gnome-online-accounts
] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
description = "A modern desktop application designed to complement existing web-based RSS accounts";
homepage = "https://jangernert.github.io/FeedReader/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo worldofpeace ];
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
};
}
pkgs/applications/networking/ftp/taxi/default.nix
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
description = "The FTP Client that drives you anywhere";
homepage = "https://github.com/Alecaddd/taxi";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/networking/instant-messengers/coyim/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, buildGoPackage, fetchFromGitHub, pkg-config,
cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
cairo, gdk-pixbuf, glib, gnome, wrapGAppsHook, gtk3 }:
buildGoPackage rec {
pname = "coyim";
@@ -16,7 +16,7 @@ buildGoPackage rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ];
buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ];
meta = with lib; {
description = "a safe and secure chat client";
pkgs/applications/networking/instant-messengers/dino/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext
, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking
, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking
, xorg, libXdmcp, libxkbcommon
, libnotify, libsoup, libgee
, librsvg, libsignal-protocol-c
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
glib-networking
glib
libgee
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
sqlite
gdk-pixbuf
gtk3
pkgs/applications/networking/instant-messengers/fractal/default.nix
+1 -1
View File
@@ -88,6 +88,6 @@ stdenv.mkDerivation rec {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill worldofpeace ];
maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]);
};
}
pkgs/applications/networking/instant-messengers/gajim/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchurl, gettext, wrapGAppsHook
# Native dependencies
, python3, gtk3, gobject-introspection, gnome3
, python3, gtk3, gobject-introspection, gnome
, glib-networking
# Test dependencies
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
};
buildInputs = [
gobject-introspection gtk3 gnome3.adwaita-icon-theme
gobject-introspection gtk3 gnome.adwaita-icon-theme
glib-networking
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]
++ lib.optional enableSecrets libsecret
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome
, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }:
@@ -31,7 +31,7 @@ let
gtk3
libappindicator-gtk3
gnome3.gnome-keyring
gnome.gnome-keyring
libnotify
libpulseaudio
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Link-local XMPP connection manager for Telepathy";
platforms = platforms.gnu ++ platforms.linux; # Random choice
maintainers = [ maintainers.lethalman ];
maintainers = [ ];
broken = true;
};
}
pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, stdenv, gnome3, cmake, pkg-config,
{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config,
libappindicator-gtk3, gst_all_1, pcre }:
stdenv.mkDerivation rec {
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome3.gtkmm
gnome3.webkitgtk
gnome.gtkmm
gnome.webkitgtk
libappindicator-gtk3
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
-1
View File
@@ -51,7 +51,6 @@ let
arianvp
kiwi
toonn
worldofpeace
];
platforms = [
"x86_64-darwin"
pkgs/applications/networking/mailreaders/astroid/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtkmm3 gmime3 webkitgtk libsass libpeas
python3
notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme
glib-networking protobuf
vim
];
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution
{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution
, sqlite, gtk3, webkitgtk, libgdata, libmspack }:
stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = "evolution-ews";
versionPolicy = "odd-unstable";
};
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+4 -4
View File
@@ -24,7 +24,7 @@
, db
, gcr
, sqlite
, gnome3
, gnome
, librsvg
, gdk-pixbuf
, libsecret
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
bogofilter
db
evolution-data-server
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
glib-networking
gnome3.gnome-desktop
gnome.gnome-desktop
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = "evolution";
versionPolicy = "odd-unstable";
};
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ lib, makeWrapper, symlinkJoin, gnome3, plugins }:
{ lib, makeWrapper, symlinkJoin, gnome, plugins }:
symlinkJoin {
name = "evolution-with-plugins";
paths = [ gnome3.evolution-data-server ] ++ plugins;
paths = [ gnome.evolution-data-server ] ++ plugins;
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix
+2 -2
View File
@@ -30,7 +30,7 @@
, libXt
, libxcb
, libcanberra
, gnome3
, gnome
, libGLU, libGL
, nspr
, nss
@@ -116,7 +116,7 @@ stdenv.mkDerivation {
stdenv.cc.cc
];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
, gdk-pixbuf
, glib
, glibc
, gnome3
, gnome
, gnugrep
, gnupg
, gnused
@@ -115,7 +115,7 @@ stdenv.mkDerivation {
stdenv.cc.cc
];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/p2p/retroshare/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2
{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome, glib, libssh, pkg-config, protobuf, bzip2
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3
, qtmultimedia, qtx11extras, qttools }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [
speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools
speex libupnp gpgme gnome.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3
];
pkgs/applications/networking/pcloud/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
# Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here.
alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss
alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss
}:
let
@@ -94,7 +94,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just
# crashes
export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud"
EOF
pkgs/applications/networking/remote/citrix-workspace/generic.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more
, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3
, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
freetype
gdk-pixbuf
gnome2.gtkglext
gnome3.webkitgtk
gnome.webkitgtk
gtk2
gtk2-x11
gtk3
pkgs/applications/networking/remote/remmina/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
# The themes here are soft dependencies; only icons are missing without them.
, gnome3
, gnome
}:
with lib;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
pcre2 libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
harfbuzz
];
pkgs/applications/networking/syncthing-gtk/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3
, bcrypt, gobject-introspection, gsettings-desktop-schemas
, pango, gdk-pixbuf, atk }:
@@ -24,7 +24,7 @@ buildPythonApplication rec {
buildInputs = [
gtk3 librsvg libappindicator-gtk3
libnotify gnome3.adwaita-icon-theme
libnotify gnome.adwaita-icon-theme
# Schemas with proxy configuration
gsettings-desktop-schemas
];
pkgs/applications/networking/weather/meteo/default.nix
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
description = "Know the forecast of the next hours & days";
homepage = "https://gitlab.com/bitseater/meteo";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/office/abiword/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, gtk3, fribidi
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
, boost, libxslt, goffice, wrapGAppsHook, gnome3
, boost, libxslt, goffice, wrapGAppsHook, gnome
}:
stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 librsvg bzip2 fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme
libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme
];
meta = with lib; {
pkgs/applications/office/gnumeric/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages
, goffice, gnome, wrapGAppsHook, gtk3, bison, python3Packages
, itstool
}:
@@ -20,14 +20,14 @@ in stdenv.mkDerivation rec {
# ToDo: optional libgda, introspection?
buildInputs = [
goffice gtk3 gnome3.adwaita-icon-theme
goffice gtk3 gnome.adwaita-icon-theme
python pygobject3
] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
pkgs/applications/office/grisbi/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
, intltool
, wrapGAppsHook
, libsoup
, gnome3
, gnome
}:
stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
libofx
intltool
libsoup
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
];
meta = with lib; {
pkgs/applications/office/homebank/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook
, libsoup, gnome3 }:
, libsoup, gnome }:
stdenv.mkDerivation rec {
name = "homebank-5.5.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ gtk libofx intltool libsoup
gnome3.adwaita-icon-theme ];
gnome.adwaita-icon-theme ];
meta = with lib; {
description = "Free, easy, personal accounting for everyone";
pkgs/applications/office/ledger-autosync/default.nix
+12 -4
View File
@@ -2,16 +2,24 @@
python3Packages.buildPythonApplication rec {
pname = "ledger-autosync";
version = "1.0.2";
version = "unstable-2021-04-01";
# no tests included in PyPI tarball
# no tests included in PyPI tarball
src = fetchFromGitHub {
owner = "egh";
repo = "ledger-autosync";
rev = "v${version}";
sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk";
rev = "0b674c57c833f75b1a36d8caf78e1567c8e2180c";
sha256 = "0q404gr85caib5hg83cnmgx4684l72w9slxyxrwsiwhlf7gm443q";
};
patches = [
# ledger-autosync specifies an URL for its ofxparse
# dependency. This patch removes the URL to only use the
# `ofxparse` name. This works because nixpkgs' version of ofxparse
# is more recent than the latest release.
./fix-ofxparse-dependency.patch
];
propagatedBuildInputs = with python3Packages; [
asn1crypto
beautifulsoup4

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