mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 10:53:11 +00:00
Merge pull request #245905 from lelgenio/qt5-remove-override-scope-quote
qt5: remove overrideScope'
This commit is contained in:
commit
a81d283aa2
@ -329,9 +329,6 @@ let
|
||||
propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ]
|
||||
++ lib.optional stdenv.isLinux self.qtwayland.dev;
|
||||
} ../hooks/wrap-qt-apps-hook.sh;
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
# remove before 23.11
|
||||
overrideScope' = lib.warn "qt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
|
||||
};
|
||||
|
||||
in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages
|
||||
|
Loading…
Reference in New Issue
Block a user