From 79a8a7c26df6b854ec9973f42a1aa0a9dd222c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 20 Oct 2022 11:14:12 +0200
Subject: mrpump: tweak gitlab runner

---
 pkgs/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 56f23cc..e2363b0 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,10 +1,9 @@
 { self, nixpkgs }:
 
 let
-  pkgs = nixpkgs // personalpkgs;
-  callPackage = nixpkgs.lib.callPackageWith pkgs;
+  callPackage = nixpkgs.newScope personalpkgs;
 
-  personalpkgs = with pkgs; {
+  personalpkgs = rec {
 
     luks-hw-password = callPackage ./luks-hw-password { };
 
@@ -22,11 +21,11 @@ let
     sdcv = callPackage ./stardict/wrapper.nix { stardict = sdcv-unwrapped; };
 
     # Package to be installed to the user's profile
-    cynerd-profile = pkgs.symlinkJoin {
+    cynerd-profile = nixpkgs.symlinkJoin {
       name = "cynerd-profile";
-      paths = with pkgs; [
+      paths = [
         self.inputs.shellrc.packages.${nixpkgs.system}.default
-        tig
+        nixpkgs.tig
       ];
     };
 
-- 
cgit v1.2.3