colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

fix deprecation warnings: overrideScope' -> overrideScope

Browse Source
This commit is contained in:
Colin
2024-02-01 15:44:46 +00:00
parent 09923b60ea
commit 18679cd8c3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
overlays/cross.nix
View File

@@ -622,7 +622,7 @@ in with final; {
# # <https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Runtime.html> # # <https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Runtime.html>
# }; # };
# firefox-extensions = prev.firefox-extensions.overrideScope' (self: super: { # firefox-extensions = prev.firefox-extensions.overrideScope (self: super: {
# unwrapped = super.unwrapped // { # unwrapped = super.unwrapped // {
# browserpass-extension = super.unwrapped.browserpass-extension.override { # browserpass-extension = super.unwrapped.browserpass-extension.override {
# mkYarnModules = args: needsBinfmtOrQemu { # mkYarnModules = args: needsBinfmtOrQemu {
@@ -870,7 +870,7 @@ in with final; {
}); });
# gnustep = prev.gnustep.overrideScope' (self: super: { # gnustep = prev.gnustep.overrideScope (self: super: {
# # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile, # # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
# # base = emulated.gnustep.base; # # base = emulated.gnustep.base;
# base = (super.base.override { # base = (super.base.override {
@@ -896,7 +896,7 @@ in with final; {
''; '';
}); });
gnome = prev.gnome.overrideScope' (self: super: { gnome = prev.gnome.overrideScope (self: super: {
# fixes "error: Package `dconf' not found in specified Vala API directories or GObject-Introspection GIR directories" # fixes "error: Package `dconf' not found in specified Vala API directories or GObject-Introspection GIR directories"
# - but ONLY if `dconf` was built with the vala feature. # - but ONLY if `dconf` was built with the vala feature.
# - dconf is NOT built with vala when cross-compiled # - dconf is NOT built with vala when cross-compiled
@@ -1050,7 +1050,7 @@ in with final; {
# ); # );
}); });
# gnome2 = prev.gnome2.overrideScope' (self: super: { # gnome2 = prev.gnome2.overrideScope (self: super: {
# # GConf = ( # # GConf = (
# # # python3 -> nativeBuildInputs fixes "2to3: command not found" # # # python3 -> nativeBuildInputs fixes "2to3: command not found"
# # # glib.dev in nativeBuildInputs fixes "gconfmarshal.list: command not found" # # # glib.dev in nativeBuildInputs fixes "gconfmarshal.list: command not found"
@@ -1322,7 +1322,7 @@ in with final; {
outputs = lib.remove "devdoc" upstream.outputs; outputs = lib.remove "devdoc" upstream.outputs;
}); });
# libsForQt5 = prev.libsForQt5.overrideScope' (self: super: { # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
# qgpgme = super.qgpgme.overrideAttrs (orig: { # qgpgme = super.qgpgme.overrideAttrs (orig: {
# # fix so it can find the MOC compiler # # fix so it can find the MOC compiler
# # it looks like it might not *need* to propagate qtbase, but so far unclear # # it looks like it might not *need* to propagate qtbase, but so far unclear
@@ -1334,7 +1334,7 @@ in with final; {
# buildInputs = orig.buildInputs ++ [ extra-cmake-modules ]; # buildInputs = orig.buildInputs ++ [ extra-cmake-modules ];
# }); # });
# }); # });
# libsForQt5 = prev.libsForQt5.overrideScope' (self: super: { # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
# # emulate all the qt5 packages, but rework `libsForQt5.callPackage` and `mkDerivation` # # emulate all the qt5 packages, but rework `libsForQt5.callPackage` and `mkDerivation`
# # to use non-emulated stdenv by default. # # to use non-emulated stdenv by default.
# mkDerivation = self.mkDerivationWith stdenv.mkDerivation; # mkDerivation = self.mkDerivationWith stdenv.mkDerivation;
@@ -1888,7 +1888,7 @@ in with final; {
# mkDerivation = self.mkDerivationWith stdenv.mkDerivation; # mkDerivation = self.mkDerivationWith stdenv.mkDerivation;
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; }; # callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# }); # });
# qt6 = prev.qt6.overrideScope' (self: super: { # qt6 = prev.qt6.overrideScope (self: super: {
# # # inherit (emulated.qt6) qtModule; # # # inherit (emulated.qt6) qtModule;
# # qtbase = super.qtbase.overrideAttrs (upstream: { # # qtbase = super.qtbase.overrideAttrs (upstream: {
# # # cmakeFlags = upstream.cmakeFlags ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # # # cmakeFlags = upstream.cmakeFlags ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

2
overlays/preferences.nix
View File

@@ -9,7 +9,7 @@
}; };
}; };
gnome = super.gnome.overrideScope' (gself: gsuper: with gself; { gnome = super.gnome.overrideScope (gself: gsuper: with gself; {
evolution-data-server = gsuper.evolution-data-server.override { evolution-data-server = gsuper.evolution-data-server.override {
# OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation # OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation
enableOAuth2 = false; enableOAuth2 = false;

4
pkgs/default.nix
View File

@@ -100,7 +100,7 @@ let
# XXX patching this is... really costly. # XXX patching this is... really costly.
# prefer to set ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf-sane}/share/alsa/ucm2" if possible instead. # prefer to set ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf-sane}/share/alsa/ucm2" if possible instead.
# alsa-project = unpatched.alsa-project.overrideScope' (sself: ssuper: { # alsa-project = unpatched.alsa-project.overrideScope (sself: ssuper: {
# alsa-ucm-conf = sself.callPackage ./additional/alsa-ucm-conf-sane { inherit (ssuper) alsa-ucm-conf; }; # alsa-ucm-conf = sself.callPackage ./additional/alsa-ucm-conf-sane { inherit (ssuper) alsa-ucm-conf; };
# }); # });
@@ -113,7 +113,7 @@ let
# mozilla keeps nerfing itself and removing configuration options # mozilla keeps nerfing itself and removing configuration options
firefox-unwrapped = callPackage ./patched/firefox-unwrapped { inherit (unpatched) firefox-unwrapped; }; firefox-unwrapped = callPackage ./patched/firefox-unwrapped { inherit (unpatched) firefox-unwrapped; };
gnome = unpatched.gnome.overrideScope' (gself: gsuper: { gnome = unpatched.gnome.overrideScope (gself: gsuper: {
gnome-control-center = import ./patched/gnome-control-center { gnome-control-center = import ./patched/gnome-control-center {
inherit (gsuper) gnome-control-center; inherit (gsuper) gnome-control-center;
}; };