diff --git a/commit_text b/commit_text index 9895886..9ed0a92 100644 --- a/commit_text +++ b/commit_text @@ -1 +1 @@ -Moved productive specialisation systemPackages to the correct place +Local packages now use callPackage in configuration.nix diff --git a/configuration.nix b/configuration.nix index 0b43f7a..91e15f4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -64,17 +64,9 @@ let aspellDicts.hu kdePackages.qtmultimedia kdePackages.karousel - ( - with pkgs; - import ./kwin4_effect_geometry_change/kwin4_effect_geometry_change.nix { - inherit lib; - inherit stdenv; - inherit fetchFromGitHub; - kpackage = kdePackages.kpackage; - kwin = kdePackages.kwin; - inherit nodejs; - } - ) + (pkgs.lib.callPackageWith ( + pkgs // pkgs.kdePackages + ) ./kwin4_effect_geometry_change/kwin4_effect_geometry_change.nix { }) gimp inkscape @@ -97,14 +89,7 @@ let crawlTiles prismlauncher mindustry - ( - with pkgs; - import ./jgrpp-0.65.2/jgrpp-0.65.2.nix { - inherit fetchFromGitHub; - inherit openttd; - inherit zstd; - } - ) + (pkgs.callPackage ./jgrpp-0.65.2/jgrpp-0.65.2.nix { }) # retroarch-full diff --git a/result b/result deleted file mode 120000 index afed766..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/m7j1lj59w72b5zpqvdd8w0gmg04apyaz-nixos-system-nixos-Updated_nixvim_in_flake \ No newline at end of file