about summary refs log tree commit diff
path: root/pkgs/sternenseemann
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-05-14 14:33:44 +0200
committersternenseemann <sternenseemann@systemli.org>2023-05-14 14:36:11 +0200
commitb9401bd57cfff9955649d5ccd3b346271d787a2e (patch)
treea1a45850c99a36835ee5ab841ff4ae4eda498ebb /pkgs/sternenseemann
parent571271db3fc1dccf1d02c2940b42eebcd4ee3291 (diff)
pkgs/sternenseemann: use (vuizvui) pkgs.callPackage
This allows us to get the fix point for scripts from callPackage instead
of building it ad hoc.
Diffstat (limited to 'pkgs/sternenseemann')
-rw-r--r--pkgs/sternenseemann/default.nix5
-rw-r--r--pkgs/sternenseemann/scripts/default.nix7
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix
index d7b0ac35..338f3065 100644
--- a/pkgs/sternenseemann/default.nix
+++ b/pkgs/sternenseemann/default.nix
@@ -1,8 +1,7 @@
-{ pkgs, lib, profpatsch }:
+{ pkgs, lib, profpatsch, callPackage }:
 
 let
   inherit (pkgs)
-    callPackage
     dontRecurseIntoAttrs
     fetchurl
     fetchFromGitHub
@@ -74,7 +73,7 @@ lib.fix (self: {
 
   vuizvui-update-programs-sqlite = python3Packages.callPackage ./vuizvui-update-programs-sqlite {
     inherit (pkgs.writers) writePython3;
-    inherit (profpatsch) getBins;
+    inherit getBins;
   };
 
   # customized third party software
diff --git a/pkgs/sternenseemann/scripts/default.nix b/pkgs/sternenseemann/scripts/default.nix
index 35e2cf70..d939b0c6 100644
--- a/pkgs/sternenseemann/scripts/default.nix
+++ b/pkgs/sternenseemann/scripts/default.nix
@@ -6,9 +6,12 @@
 , openssl
 , perl, mandoc
 , gpp
+, sternenseemann
 }:
 
 let
+  self = sternenseemann.scripts;
+
   backupExcludes = writeText "backup-excludes" ''
     /home/lukas/.cache
     /home/lukas/.config/chromium
@@ -42,7 +45,7 @@ let
 
 in
 
-lib.fix (self: {
+{
   default = [
     self.borg-wrapper
     self.lowview
@@ -193,4 +196,4 @@ lib.fix (self: {
       printf '\a'
     fi
   '';
-})
+}