treewide: format
All checks were successful
Check flake / build-amd64-linux (push) Successful in 2m53s
All checks were successful
Check flake / build-amd64-linux (push) Successful in 2m53s
This commit is contained in:
@@ -15,21 +15,22 @@ let
|
||||
directory = ../pkgs;
|
||||
};
|
||||
in
|
||||
lib.mapAttrs
|
||||
(name: value:
|
||||
if lib.isAttrs value then
|
||||
if lib.hasAttrByPath [ name "overrideScope" ] prev then
|
||||
# Namespaced package sets created with `lib.makeScope pkgs.newScope`.
|
||||
prev.${name}.overrideScope (final': prev':
|
||||
lib.mapAttrs (name': value': final'.callPackage value' { }) value)
|
||||
else if lib.hasAttrByPath [ name "extend" ] prev then
|
||||
# Namespaced package sets created with `lib.makeExtensible`.
|
||||
prev.${name}.extend (final': prev':
|
||||
lib.mapAttrs (name': value': final.callPackage value' { }) value)
|
||||
else
|
||||
# Namespaced package sets in regular attrsets.
|
||||
prev.${name} // value
|
||||
else
|
||||
final.callPackage value { })
|
||||
pkgs
|
||||
|
||||
lib.mapAttrs (
|
||||
name: value:
|
||||
if lib.isAttrs value then
|
||||
if lib.hasAttrByPath [ name "overrideScope" ] prev then
|
||||
# Namespaced package sets created with `lib.makeScope pkgs.newScope`.
|
||||
prev.${name}.overrideScope (
|
||||
final': prev': lib.mapAttrs (name': value': final'.callPackage value' { }) value
|
||||
)
|
||||
else if lib.hasAttrByPath [ name "extend" ] prev then
|
||||
# Namespaced package sets created with `lib.makeExtensible`.
|
||||
prev.${name}.extend (
|
||||
final': prev': lib.mapAttrs (name': value': final.callPackage value' { }) value
|
||||
)
|
||||
else
|
||||
# Namespaced package sets in regular attrsets.
|
||||
prev.${name} // value
|
||||
else
|
||||
final.callPackage value { }
|
||||
) pkgs
|
||||
|
@@ -1,5 +1,4 @@
|
||||
final: prev:
|
||||
{
|
||||
final: prev: {
|
||||
gvdb = prev.fetchgit {
|
||||
url = "https://gitlab.gnome.org/GNOME/gvdb.git";
|
||||
rev = "b54bc5da25127ef416858a3ad92e57159ff565b3"; # From gvdb_wrap
|
||||
|
@@ -1,5 +1,4 @@
|
||||
final: prev:
|
||||
{
|
||||
final: prev: {
|
||||
libpisp = final.stdenv.mkDerivation {
|
||||
name = "libpisp";
|
||||
version = "1.0.5";
|
||||
@@ -42,10 +41,12 @@ final: prev:
|
||||
./0001-Ignore-IPA-signing.patch
|
||||
];
|
||||
|
||||
buildInputs = old.buildInputs ++ (with final; [
|
||||
libpisp
|
||||
libglibutil
|
||||
]);
|
||||
buildInputs =
|
||||
old.buildInputs
|
||||
++ (with final; [
|
||||
libpisp
|
||||
libglibutil
|
||||
]);
|
||||
|
||||
mesonFlags = old.mesonFlags ++ [
|
||||
"--buildtype=release"
|
||||
|
Reference in New Issue
Block a user