aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-04-14 13:33:35 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-04-14 13:33:35 +0200
commit37b417d2ec92da9ce3701b63a0c8e9a82385a0a7 (patch)
treebdc82c2444c15d9f1b598882c41f9c859be3b804
parentpkgs/fupdate: Rewrite in rust (diff)
downloadnixos-config-37b417d2ec92da9ce3701b63a0c8e9a82385a0a7.zip
pkgs/default.nix: No longer required `sysLib` as input
-rw-r--r--flake.nix2
-rw-r--r--pkgs/default.nix13
2 files changed, 2 insertions, 13 deletions
diff --git a/flake.nix b/flake.nix
index 0fa1c1e0..220095aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -286,7 +286,7 @@
pkgsStable = nixpkgs-stable.legacyPackages.${system};
pkgs = nixpkgs.legacyPackages.${system};
myPkgs = import ./pkgs {
- inherit sysLib pkgs nixLib;
+ inherit pkgs nixLib;
};
nixpkgs_as_input = nixpkgs;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 41bb654f..dfef2b60 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,21 +1,10 @@
{
pkgs,
- sysLib,
nixLib,
}: let
inherit (pkgs) lib;
- maybeMergeMessage = "the ./pkgs/by-name set";
- mMM = maybeMergeMessage;
- callPackage =
- lib.callPackageWith
- (nixLib.warnMerge
- (nixLib.warnMerge
- pkgs
- myPkgs
- mMM)
- {inherit sysLib;}
- mMM);
+ callPackage = lib.callPackageWith (nixLib.warnMerge pkgs myPkgs "the ./pkgs/by-name set");
myPkgs = nixLib.mkByName {
baseDirectory = ./by-name;