Browse Source

Merge staging-next into master

nim-0.20.0
Frederik Rietdijk 3 years ago
committed by GitHub
parent
commit
fd2bd6e433
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      lib/systems/default.nix
  2. 3
      lib/systems/doubles.nix
  3. 14
      lib/systems/examples.nix
  4. 1
      lib/systems/for-meta.nix
  5. 1
      lib/systems/inspect.nix
  6. 40
      lib/systems/parse.nix
  7. 2
      lib/tests/systems.nix
  8. 2
      nixos/modules/programs/dconf.nix
  9. 2
      nixos/modules/services/x11/desktop-managers/gnome3.nix
  10. 4
      pkgs/applications/audio/radiotray-ng/default.nix
  11. 4
      pkgs/applications/audio/sonata/default.nix
  12. 4
      pkgs/applications/audio/sound-juicer/default.nix
  13. 4
      pkgs/applications/graphics/glabels/default.nix
  14. 3
      pkgs/applications/graphics/shotwell/default.nix
  15. 3
      pkgs/applications/misc/notify-osd-customizable/default.nix
  16. 4
      pkgs/applications/misc/notify-osd/default.nix
  17. 4
      pkgs/applications/misc/xmr-stak/default.nix
  18. 4
      pkgs/applications/misc/xmrig/proxy.nix
  19. 4
      pkgs/applications/networking/syncthing-gtk/default.nix
  20. 4
      pkgs/applications/office/zotero/default.nix
  21. 4
      pkgs/applications/video/pitivi/default.nix
  22. 3
      pkgs/build-support/bintools-wrapper/default.nix
  23. 5
      pkgs/build-support/cc-wrapper/add-flags.sh
  24. 2
      pkgs/build-support/cc-wrapper/cc-wrapper.sh
  25. 68
      pkgs/build-support/cc-wrapper/default.nix
  26. 21
      pkgs/build-support/libredirect/libredirect.c
  27. 4
      pkgs/desktops/gnome-3/apps/glade/default.nix
  28. 4
      pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
  29. 4
      pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
  30. 4
      pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
  31. 4
      pkgs/desktops/gnome-3/apps/gnome-music/default.nix
  32. 4
      pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
  33. 4
      pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
  34. 4
      pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
  35. 4
      pkgs/desktops/gnome-3/apps/polari/default.nix
  36. 4
      pkgs/desktops/gnome-3/apps/seahorse/default.nix
  37. 4
      pkgs/desktops/gnome-3/core/empathy/default.nix
  38. 4
      pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
  39. 4
      pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
  40. 4
      pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
  41. 4
      pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  42. 4
      pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
  43. 4
      pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
  44. 4
      pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
  45. 6
      pkgs/desktops/gnome-3/core/gnome-shell/default.nix
  46. 4
      pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
  47. 4
      pkgs/desktops/gnome-3/core/nautilus/default.nix
  48. 5
      pkgs/desktops/gnome-3/default.nix
  49. 4
      pkgs/desktops/gnome-3/devtools/anjuta/default.nix
  50. 4
      pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
  51. 4
      pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
  52. 6
      pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
  53. 21
      pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
  54. 2
      pkgs/development/compilers/gcc/common/platform-flags.nix
  55. 4
      pkgs/development/compilers/llvm/8/compiler-rt.nix
  56. 4
      pkgs/development/compilers/llvm/8/default.nix
  57. 17
      pkgs/development/compilers/llvm/8/libc++/default.nix
  58. 19
      pkgs/development/compilers/llvm/8/libc++abi.nix
  59. 12
      pkgs/development/compilers/llvm/8/libcxxabi-no-threads.patch
  60. 16
      pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch
  61. 8
      pkgs/development/interpreters/perl/default.nix
  62. 1481
      pkgs/development/interpreters/wasmtime/cargo-lock.patch
  63. 31
      pkgs/development/interpreters/wasmtime/default.nix
  64. 9
      pkgs/development/libraries/cairo/default.nix
  65. 7
      pkgs/development/libraries/cracklib/default.nix
  66. 4
      pkgs/development/libraries/flatpak/default.nix
  67. 3
      pkgs/development/libraries/gmp/6.x.nix
  68. 8
      pkgs/development/libraries/gnu-config/default.nix
  69. 0
      pkgs/development/libraries/gsettings-desktop-schemas/default.nix
  70. 4
      pkgs/development/libraries/gtk+/3.x.nix
  71. 14
      pkgs/development/libraries/http-parser/default.nix
  72. 18
      pkgs/development/libraries/libpng/default.nix
  73. 4
      pkgs/development/libraries/libseccomp/default.nix
  74. 27
      pkgs/development/libraries/libuv/default.nix
  75. 4
      pkgs/development/libraries/nghttp2/default.nix
  76. 6
      pkgs/development/libraries/pango/default.nix
  77. 29
      pkgs/development/libraries/wasilibc/default.nix
  78. 4
      pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
  79. 4
      pkgs/development/perl-modules/BerkeleyDB/default.nix
  80. 4
      pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
  81. 6
      pkgs/development/perl-modules/DBD-SQLite/default.nix
  82. 10
      pkgs/development/perl-modules/DBD-mysql/default.nix
  83. 4
      pkgs/development/perl-modules/DB_File/default.nix
  84. 4
      pkgs/development/python-modules/Cython/default.nix
  85. 4
      pkgs/development/python-modules/Mako/default.nix
  86. 4
      pkgs/development/python-modules/absl-py/default.nix
  87. 4
      pkgs/development/python-modules/agate-sql/default.nix
  88. 4
      pkgs/development/python-modules/aioconsole/default.nix
  89. 4
      pkgs/development/python-modules/alembic/default.nix
  90. 4
      pkgs/development/python-modules/ansible-runner/default.nix
  91. 4
      pkgs/development/python-modules/argcomplete/default.nix
  92. 6
      pkgs/development/python-modules/astroid/1.6.nix
  93. 4
      pkgs/development/python-modules/astropy-helpers/default.nix
  94. 4
      pkgs/development/python-modules/atomman/default.nix
  95. 4
      pkgs/development/python-modules/autopep8/default.nix
  96. 4
      pkgs/development/python-modules/awkward/default.nix
  97. 4
      pkgs/development/python-modules/bootstrapped-pip/default.nix
  98. 4
      pkgs/development/python-modules/cffi/default.nix
  99. 4
      pkgs/development/python-modules/chainmap/default.nix
  100. 4
      pkgs/development/python-modules/chameleon/default.nix

7
lib/systems/default.nix

@ -30,6 +30,7 @@ rec {
libc =
/**/ if final.isDarwin then "libSystem"
else if final.isMinGW then "msvcrt"
else if final.isWasi then "wasilibc"
else if final.isMusl then "musl"
else if final.isUClibc then "uclibc"
else if final.isAndroid then "bionic"
@ -62,7 +63,7 @@ rec {
"netbsd" = "NetBSD";
"freebsd" = "FreeBSD";
"openbsd" = "OpenBSD";
"wasm" = "Wasm";
"wasi" = "Wasi";
}.${final.parsed.kernel.name} or null;
# uname -p
@ -114,8 +115,8 @@ rec {
then "${wine}/bin/${wine-name}"
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
then "${qemu-user}/bin/qemu-${final.qemuArch}"
else if final.isWasm
then "${pkgs.v8}/bin/d8"
else if final.isWasi
then "${pkgs.wasmtime}/bin/wasmtime"
else throw "Don't know how to run ${final.config} executables.";
} // mapAttrs (n: v: v final.parsed) inspect.predicates

3
lib/systems/doubles.nix

@ -17,6 +17,8 @@ let
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
"x86_64-windows" "i686-windows"
"wasm64-wasi" "wasm32-wasi"
];
allParsed = map parse.mkSystemFromString all;
@ -45,6 +47,7 @@ in rec {
netbsd = filterDoubles predicates.isNetBSD;
openbsd = filterDoubles predicates.isOpenBSD;
unix = filterDoubles predicates.isUnix;
wasi = filterDoubles predicates.isWasi;
windows = filterDoubles predicates.isWindows;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];

14
lib/systems/examples.nix

@ -116,7 +116,7 @@ rec {
config = "aarch64-none-elf";
libc = "newlib";
};
aarch64be-embedded = {
config = "aarch64_be-none-elf";
libc = "newlib";
@ -126,7 +126,7 @@ rec {
config = "powerpc-none-eabi";
libc = "newlib";
};
ppcle-embedded = {
config = "powerpcle-none-eabi";
libc = "newlib";
@ -211,4 +211,14 @@ rec {
config = "x86_64-unknown-netbsd";
libc = "nblibc";
};
#
# WASM
#
wasi32 = {
config = "wasm32-unknown-wasi";
useLLVM = true;
};
}

1
lib/systems/for-meta.nix

@ -32,6 +32,7 @@ in rec {
openbsd = [ patterns.isOpenBSD ];
unix = patterns.isUnix; # Actually a list
windows = [ patterns.isWindows ];
wasi = [ patterns.isWasi ];
inherit (lib.systems.doubles) mesaPlatforms;
}

1
lib/systems/inspect.nix

@ -43,6 +43,7 @@ rec {
isWindows = { kernel = kernels.windows; };
isCygwin = { kernel = kernels.windows; abi = abis.cygnus; };
isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
isWasi = { kernel = kernels.wasi; };
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];

40
lib/systems/parse.nix

@ -69,24 +69,24 @@ rec {
cpuTypes = with significantBytes; setTypes types.openCpuType {
arm = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; };
armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; };
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; };
armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; };
aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; };
i386 = { bits = 32; significantByte = littleEndian; family = "x86"; };
i486 = { bits = 32; significantByte = littleEndian; family = "x86"; };
i586 = { bits = 32; significantByte = littleEndian; family = "x86"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; arch = "armv5t"; };
armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6-m"; };
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6"; };
armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-a"; };
armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-r"; };
armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-m"; };
armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7"; };
armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-m"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
i386 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i386"; };
i486 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i486"; };
i586 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i586"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
@ -226,6 +226,7 @@ rec {
elf = {};
macho = {};
pe = {};
wasm = {};
unknown = {};
};
@ -268,6 +269,7 @@ rec {
none = { execFormat = unknown; families = { }; };
openbsd = { execFormat = elf; families = { inherit bsd; }; };
solaris = { execFormat = elf; families = { }; };
wasi = { execFormat = wasm; families = { }; };
windows = { execFormat = pe; families = { }; };
} // { # aliases
# 'darwin' is the kernel for all of them. We choose macOS by default.
@ -376,6 +378,8 @@ rec {
then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; }
else if (elemAt l 2 == "wasi")
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi"; }
else if hasPrefix "netbsd" (elemAt l 2)
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])

2
lib/tests/systems.nix

@ -12,7 +12,7 @@ let
expected = lib.sort lib.lessThan y;
};
in with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ windows);
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows);
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ];

2
nixos/modules/programs/dconf.nix

@ -38,7 +38,7 @@ in
"${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891
#environment.variables.XDG_DATA_DIRS = optional cfg.enable
# "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
# "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)";
};
}

2
nixos/modules/services/x11/desktop-managers/gnome3.nix

@ -18,7 +18,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }
''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -rf ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}

4
pkgs/applications/audio/radiotray-ng/default.nix

@ -10,7 +10,7 @@
# GUI/Desktop
, dbus
, glibmm
, gnome3
, gsettings-desktop-schemas
, hicolor-icon-theme
, libappindicator-gtk3
, libnotify
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
boost jsoncpp libbsd pcre
glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify
glibmm hicolor-icon-theme gsettings-desktop-schemas libappindicator-gtk3 libnotify
libxdg_basedir
lsb-release
wxGTK

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook
, python3Packages, gnome3, gtk3, gobject-introspection}:
, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }:
let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
@ -20,7 +20,7 @@ in buildPythonApplication rec {
buildInputs = [
intltool wrapGAppsHook
gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
];
postPatch = ''

4
pkgs/applications/audio/sound-juicer/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero
, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, wrapGAppsHook }:
, gsettings-desktop-schemas, wrapGAppsHook }:
let
pname = "sound-juicer";
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [
glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
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
gst_all_1.gst-libav

4
pkgs/applications/graphics/glabels/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc gnome3.yelp-tools
gnome3.gnome-common gnome3.gsettings-desktop-schemas
gnome3.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
hicolor-icon-theme
];

3
pkgs/applications/graphics/shotwell/default.nix

@ -32,6 +32,7 @@
, itstool
, libgdata
, libchamplain
, gsettings-desktop-schemas
, python3
}:
@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
libgee
libgudev
gexiv2
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
libraw
json-glib
glib

3
pkgs/applications/misc/notify-osd-customizable/default.nix

@ -8,6 +8,7 @@
, libwnck3
, makeWrapper
, pkgconfig
, gsettings-desktop-schemas
}:
let baseURI = "https://launchpad.net/~leolik/+archive/leolik";
@ -26,7 +27,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper
gnome3.gsettings-desktop-schemas gnome3.gnome-common
gsettings-desktop-schemas gnome3.gnome-common
libtool
];

4
pkgs/applications/misc/notify-osd/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }:
{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "notify-osd-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
];
configureFlags = [ "--libexecdir=$(out)/bin" ];

4
pkgs/applications/misc/xmr-stak/default.nix

@ -12,13 +12,13 @@ in
stdenv'.mkDerivation rec {
name = "xmr-stak-${version}";
version = "2.10.1";
version = "2.10.4";
src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = "${version}";
sha256 = "0381r4nr5cx0zv3dhsvld4ibpp5gq911815h03v92688za3swhng";
sha256 = "0f3cs0jw0yn8lbcm43m34dnvvgr4qpb8wa176vh4whk7bbjkw7lz";
};
NIX_CFLAGS_COMPILE = "-O3";

4
pkgs/applications/misc/xmrig/proxy.nix

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "xmrig-proxy-${version}";
version = "2.14.0";
version = "2.14.1";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
sha256 = "0yw9g18blrwncy1ya9iwbfx8l7bs0v6nmnkk71bxz4zj9d8dkal3";
sha256 = "1sw00qz4yg8cwmm3s64bqr3lki6bxmlsi4ankyy2l4dx1vs9kf6r";
};
nativeBuildInputs = [ cmake ];

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
, bcrypt, gobject-introspection }:
, bcrypt, gobject-introspection, gsettings-desktop-schemas }:
buildPythonApplication rec {
version = "0.9.4";
@ -24,7 +24,7 @@ buildPythonApplication rec {
gtk3 librsvg libappindicator-gtk3
libnotify gnome3.adwaita-icon-theme
# Schemas with proxy configuration
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
];
propagatedBuildInputs = [

4
pkgs/applications/office/zotero/default.nix

@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
name = "zotero-${version}";
version = "5.0.60";
version = "5.0.66";
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d";
sha256 = "1dpcwpag95a4r46z03a3gqklis0q7nzqgjg34qfxxxb2lr7s1lsm";
};
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];

4
pkgs/applications/video/pitivi/default.nix

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst_all_1, gtk3
, gobject-introspection, librsvg, gnome3, libnotify, gsound
, meson, ninja
, meson, ninja, gsettings-desktop-schemas
}:
let
@ -49,7 +49,7 @@ in python3Packages.buildPythonApplication rec {
buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libnotify
gsettings-desktop-schemas libnotify
gst-transcoder
] ++ (with gst_all_1; [
gstreamer gst-editing-services

3
pkgs/build-support/bintools-wrapper/default.nix

@ -191,7 +191,8 @@ stdenv.mkDerivation {
else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha"
else throw "unknown emulation for platform: ${targetPlatform.config}";
in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
in if targetPlatform.useLLVM or false then ""
else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
strictDeps = true;
depsTargetTargetPropagated = extraPackages;

5
pkgs/build-support/cc-wrapper/add-flags.sh

@ -6,6 +6,7 @@
var_templates_list=(
NIX+CFLAGS_COMPILE
NIX+CFLAGS_COMPILE_BEFORE
NIX+CFLAGS_LINK
NIX+CXXSTDLIB_COMPILE
NIX+CXXSTDLIB_LINK
@ -43,5 +44,9 @@ if [ -e @out@/nix-support/cc-ldflags ]; then
NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)"
fi
if [ -e @out@/nix-support/cc-cflags-before ]; then
NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE="$(< @out@/nix-support/cc-cflags-before) $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE"
fi
# That way forked processes will not extend these environment variables again.
export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1

2
pkgs/build-support/cc-wrapper/cc-wrapper.sh

@ -135,7 +135,7 @@ source @out@/nix-support/add-hardening.sh
# Add the flags for the C compiler proper.
extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE)
extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"})
extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE)
if [ "$dontLink" != 1 ]; then

68
pkgs/build-support/cc-wrapper/default.nix

@ -63,6 +63,25 @@ let
then import ../expand-response-params { inherit (buildPackages) stdenv; }
else "";
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
isGccArchSupported = arch:
if cc.isGNU or false then
{ skylake = versionAtLeast ccVersion "6.0";
skylake-avx512 = versionAtLeast ccVersion "6.0";
cannonlake = versionAtLeast ccVersion "8.0";
icelake-client = versionAtLeast ccVersion "8.0";
icelake-server = versionAtLeast ccVersion "8.0";
knm = versionAtLeast ccVersion "8.0";
}.${arch} or true
else if cc.isClang or false then
{ cannonlake = versionAtLeast ccVersion "5.0";
icelake-client = versionAtLeast ccVersion "7.0";
icelake-server = versionAtLeast ccVersion "7.0";
knm = versionAtLeast ccVersion "7.0";
}.${arch} or true
else
false;
in
# Ensure bintools matches
@ -279,23 +298,56 @@ stdenv.mkDerivation {
export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}"
''
+ optionalString hostPlatform.isCygwin ''
hardening_unsupported_flags+=" pic"
# Machine flags. These are necessary to support
# TODO: We should make a way to support miscellaneous machine
# flags and other gcc flags as well.
# Always add -march based on cpu in triple. Sometimes there is a
# discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
# that case.
+ optionalString ((targetPlatform ? platform.gcc.arch) &&
isGccArchSupported targetPlatform.platform.gcc.arch) ''
echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before
''
+ optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector"
# -mcpu is not very useful. You should use mtune and march
# instead. It’s provided here for backwards compatibility.
+ optionalString (targetPlatform ? platform.gcc.cpu) ''
echo "-mcpu=${targetPlatform.platform.gcc.cpu}" >> $out/nix-support/cc-cflags-before
''
+ optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic"
# -mfloat-abi only matters on arm32 but we set it here
# unconditionally just in case. If the abi specifically sets hard
# vs. soft floats we use it here.
+ optionalString (targetPlatform ? platform.gcc.float-abi) ''
echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
''
+ optionalString (targetPlatform ? platform.gcc.fpu) ''
echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
''
+ optionalString (targetPlatform ? platform.gcc.mode) ''
echo "-mmode=${targetPlatform.platform.gcc.mode}" >> $out/nix-support/cc-cflags-before
''
+ optionalString (targetPlatform ? platform.gcc.tune &&
isGccArchSupported targetPlatform.platform.gcc.tune) ''
echo "-mtune=${targetPlatform.platform.gcc.tune}" >> $out/nix-support/cc-cflags-before
''
+ optionalString targetPlatform.isNetBSD ''
# TODO: categorize these and figure out a better place for them
+ optionalString hostPlatform.isCygwin ''
hardening_unsupported_flags+=" pic"
'' + optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector"
'' + optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic"
'' + optionalString (targetPlatform.libc == "newlib") ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
'' + optionalString targetPlatform.isNetBSD ''
hardening_unsupported_flags+=" stackprotector fortify"
''
+ optionalString (targetPlatform.libc == "newlib") ''
+ optionalString targetPlatform.isWasm ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
''

21
pkgs/build-support/libredirect/libredirect.c

@ -91,6 +91,20 @@ int open64(const char * path, int flags, ...)
return open64_real(rewrite(path, buf), flags, mode);
}
int openat(int dirfd, const char * path, int flags, ...)
{
int (*openat_real) (int, const char *, int, mode_t) = dlsym(RTLD_NEXT, "openat");
mode_t mode = 0;
if (flags & O_CREAT) {
va_list ap;
va_start(ap, flags);
mode = va_arg(ap, mode_t);
va_end(ap);
}
char buf[PATH_MAX];
return openat_real(dirfd, rewrite(path, buf), flags, mode);
}
FILE * fopen(const char * path, const char * mode)
{
FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen");
@ -152,3 +166,10 @@ int execv(const char *path, char *const argv[])
char buf[PATH_MAX];
return execv_real(rewrite(path, buf), argv);
}
void *dlopen(const char *filename, int flag)
{
void * (*__dlopen_real) (const char *, int) = dlsym(RTLD_NEXT, "dlopen");
char buf[PATH_MAX];
return __dlopen_real(rewrite(filename, buf), flag);
}

4
pkgs/desktops/gnome-3/apps/glade/default.nix

@ -1,7 +1,7 @@
{ stdenv, intltool, fetchurl, python3
, pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, libxml2, docbook_xsl
, gnome3, gdk_pixbuf, libxslt }:
, gnome3, gdk_pixbuf, libxslt, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "glade-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib libxml2 python3 python3.pkgs.pygobject3
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme
];

4
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix

@ -4,7 +4,7 @@
, gnome-desktop, libzapojit, libgepub
, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
, gobject-introspection, inkscape, poppler_utils
, desktop-file-utils, wrapGAppsHook, python3 }:
, desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gnome-documents-${version}";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
inkscape poppler_utils # building getting started
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas
gtk3 glib gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme evince
libsoup webkitgtk gjs gobject-introspection
tracker tracker-miners libgdata

4
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils
, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }:
, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gnome-logs-${version}";
@ -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.adwaita-icon-theme ];
buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
postPatch = ''
chmod +x meson_post_install.py

4
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
, gobject-introspection, gdk_pixbuf, librsvg, libgweather
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas
, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
let
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
gtk3 geoclue2 gjs libgee folks gfbgraph
geocode-glib libchamplain libsoup
gdk_pixbuf librsvg libgweather
gnome3.gsettings-desktop-schemas evolution-data-server
gsettings-desktop-schemas evolution-data-server
gnome-online-accounts gnome3.adwaita-icon-theme
webkitgtk
];

4
pkgs/desktops/gnome-3/apps/gnome-music/default.nix

@ -2,7 +2,7 @@
, libxml2, python3, libnotify, wrapGAppsHook, libmediaart
, gobject-introspection, gnome-online-accounts, grilo, grilo-plugins
, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
, itstool, gnome3, gst_all_1, libdazzle, libsoup }:
, itstool, gnome3, gst_all_1, libdazzle, libsoup, gsettings-desktop-schemas }:
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
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
gsettings-desktop-schemas tracker
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
];
propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ];

4
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix

@ -2,7 +2,7 @@
, wrapGAppsHook, itstool, desktop-file-utils, python3
, glib, gtk3, evolution-data-server
, libuuid, webkitgtk, zeitgeist
, gnome3, libxml2 }:
, gnome3, libxml2, gsettings-desktop-schemas }:
let
version = "3.32.1";
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 libuuid webkitgtk gnome3.tracker
gnome3.gnome-online-accounts zeitgeist
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
evolution-data-server
gnome3.adwaita-icon-theme
];

4
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix

@ -4,7 +4,7 @@
, grilo, gnome-online-accounts
, desktop-file-utils, wrapGAppsHook
, gnome3, gdk_pixbuf, gexiv2, geocode-glib
, dleyna-renderer, dbus, meson, ninja, python3 }:
, dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }:
let
pname = "gnome-photos";
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib gegl babl libgdata libdazzle
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme
gfbgraph grilo-plugins grilo
gnome-online-accounts tracker

4
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection
, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }:
, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gnome-weather-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
buildInputs = [
gtk3 gjs gobject-introspection gnome-desktop
libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas
];
postPatch = ''

4
pkgs/desktops/gnome-3/apps/polari/default.nix

@ -1,7 +1,7 @@
{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
, pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib
, gnome3, wrapGAppsHook, telepathy-logger, gspell }:
, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
let
pname = "polari";
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas
gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup
];

4
pkgs/desktops/gnome-3/apps/seahorse/default.nix

@ -2,7 +2,7 @@
, pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, gpgme, python3, openldap, gcr
, libsecret, avahi, p11-kit, openssh }:
, libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
pname = "seahorse";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib gcr
gnome3.gsettings-desktop-schemas gnupg
gsettings-desktop-schemas gnupg
gnome3.adwaita-icon-theme gpgme
libsecret avahi libsoup p11-kit
openssh openldap libpwquality

4
pkgs/desktops/gnome-3/core/empathy/default.nix

@ -6,7 +6,7 @@
, telepathy-logger, libnotify, clutter, libsoup, gnutls
, evolution-data-server, yelp-xsl
, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info
, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee
, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee, gsettings-desktop-schemas
, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
stdenv.mkDerivation rec {
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gcr libsecret libpulseaudio gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11-kit
libcanberra-gtk3 telepathy-farstream farstream
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
gnome3.adwaita-icon-theme gsettings-desktop-schemas
librsvg
# Spell-checking
enchant isocodes

4
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3 }:
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }:
let
pname = "gnome-bluetooth";
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
glib gtk3 udev libnotify libcanberra-gtk3
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
gnome3.adwaita-icon-theme gsettings-desktop-schemas
];
mesonFlags = [

4
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix

@ -1,6 +1,6 @@
{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
, gnome3, mpfr, gmp, libsoup, libmpc }:
, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gnome-calculator-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libxml2 gtksourceview4 mpfr gmp
gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libsoup libmpc
gsettings-desktop-schemas libsoup libmpc
];
doCheck = true;

4
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix

@ -2,7 +2,7 @@
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
, vala, meson, ninja, libhandy }:
, vala, meson, ninja, libhandy, gsettings-desktop-schemas }:
let
version = "3.32";
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas
gtk3 glib evolution-data-server gsettings-desktop-schemas
folks gnome-desktop telepathy-glib libhandy
libxml2 gnome-online-accounts cheese
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib

4
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch
, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }:
, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
gtk3 glib libseccomp
];
propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ];
propagatedBuildInputs = [ gsettings-desktop-schemas ];
patches = [
(substituteAll {

4
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
, gnome3, gtk3, glib }:
, gnome3, gtk3, glib, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gnome-dictionary-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
passthru = {
updateScript = gnome3.updateScript {

4
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix

@ -1,6 +1,6 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
, itstool, gnome3, libxml2
, itstool, gnome3, libxml2, gsettings-desktop-schemas
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
udisks2 gnome3.adwaita-icon-theme
gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas
gnome3.gnome-settings-daemon gsettings-desktop-schemas
];
postPatch = ''

4
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix

@ -1,6 +1,6 @@
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
, gnome3 }:
, gnome3, gsettings-desktop-schemas }:
let
pname = "gnome-screenshot";
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [
gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
];
passthru = {

6
pkgs/desktops/gnome-3/core/gnome-shell/default.nix

@ -1,5 +1,5 @@
{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
@ -10,7 +10,7 @@
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
let
pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
in stdenv.mkDerivation rec {
name = "gnome-shell-${version}";
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
sassc desktop-file-utils libxslt.bin
sassc desktop-file-utils libxslt.bin python3
];
buildInputs = [
systemd caribou

4
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix

@ -1,6 +1,6 @@
{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3
, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
stdenv.mkDerivation rec {
name = "gnome-system-monitor-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
gnome3.gsettings-desktop-schemas systemd
gsettings-desktop-schemas systemd
];
postPatch = ''

4
pkgs/desktops/gnome-3/core/nautilus/default.nix

@ -2,7 +2,7 @@
, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
, substituteAll, bubblewrap, gst_all_1
, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
}:
let
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
gnome3.adwaita-icon-theme gsettings-desktop-schemas
];
propagatedBuildInputs = [ gnome-autoar ];

5
pkgs/desktops/gnome-3/default.nix

@ -84,7 +84,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gjs = callPackage ./core/gjs { };
glib-networking = pkgs.glib-networking.override {
inherit gsettings-desktop-schemas;
inherit (pkgs) gsettings-desktop-schemas;
};
gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
@ -145,8 +145,6 @@ lib.makeScope pkgs.newScope (self: with self; {
grilo-plugins = callPackage ./core/grilo-plugins { };
gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { };
gucharmap = callPackage ./core/gucharmap { };
gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
@ -395,6 +393,7 @@ lib.makeScope pkgs.newScope (self: with self; {
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
defaultIconTheme = adwaita-icon-theme;
gtk = gtk3;
gtkmm = gtkmm3;

4
pkgs/desktops/gnome-3/devtools/anjuta/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
gdl, libgda, gtksourceview,
gdl, libgda, gtksourceview, gsettings-desktop-schemas,
itstool, python3, ncurses, makeWrapper }:
stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [
flex bison gtk3 libxml2 gnome3.gjs gdl
libgda gtksourceview
gnome3.gsettings-desktop-schemas
gsettings-desktop-schemas
];
preFixup = ''

4
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix

@ -1,5 +1,5 @@
{ stdenv, meson, ninja, gettext, fetchurl
, pkgconfig, gtk3, glib, libsoup
, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
, itstool, libxml2, python3Packages
, gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas
gtk3 glib gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme
libnotify gnome3.gnome-shell python3Packages.pygobject3
libsoup gnome3.gnome-settings-daemon gnome3.nautilus

4
pkgs/desktops/gnome-3/misc/gtkhtml/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool
, gnome3, enchant, isocodes }:
, gnome3, enchant, isocodes, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "gtkhtml-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas ];
gsettings-desktop-schemas ];
propagatedBuildInputs = [ enchant isocodes ];

6
pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix

<
@ -1,4 +1,4 @@
{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas
{ stdenv, runCommand, mutter, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas
, extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? []
}:
@ -9,7 +9,7 @@ let
elementary-settings-daemon
epiphany
gala
gnome3.mutter
mutter
gsettings-desktop-schemas
gtk3
plank