Delete importing of pinned-nixpkgs.nix

SimulaVR · Nov 18, 2024 · f72a60b · f72a60b
1 parent 6b9443f
commit f72a60b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Simula.nix b/Simula.nix
@@ -25,11 +25,11 @@ let
     wlroots-dev = callPackage ./submodules/wlroots/wlroots.nix { stdenv = stdenvRes; };
     vulkan-loader-custom = if onNixOS then vulkan-loader else (callPackage ./nix/vulkan-loader.nix { });
     glibc-locales = glibcLocales;
-    godot = callPackage ./submodules/godot/godot.nix { devBuild = devBuild; onNixOS = onNixOS; pkgs = import ./pinned-nixpkgs.nix; };
+    godot = callPackage ./submodules/godot/godot.nix { devBuild = devBuild; onNixOS = onNixOS; pkgs = pkgs; };
     godot-api = "${godot}/bin/api.json";
 
     haskellCallPkg = if profileBuild then (pkgs.haskellPackagesPIC.callPackage) else (haskellPackages.callPackage);
-    haskellCallPkgNoProfile = (import ./pinned-nixpkgs.nix { }).haskellPackages.callPackage;
+    haskellCallPkgNoProfile = pkgs.haskellPackages.callPackage;
     godot-haskell-classgen = haskellCallPkgNoProfile ./submodules/godot-haskell-cabal/classgen/classgen.nix { };
     godot-haskell = haskellCallPkg ./submodules/godot-haskell/godot-haskell.nix { api-json = godot-api; profileBuild = profileBuild; godot-haskell-classgen = godot-haskell-classgen; };
     godot-haskell-plugin = haskellCallPkg ./addons/godot-haskell-plugin/godot-haskell-plugin.nix { devBuild = devBuild; onNixOS = onNixOS; godot = godot; godot-haskell = godot-haskell; profileBuild = profileBuild; };

diff --git a/default.nix b/default.nix
@@ -1,5 +1,2 @@
-{ onNixOS, devBuild, profileBuild ? false }:
-let
-    pkgs = if profileBuild then (import ./pinned-nixpkgs.nix { overlays = (import ./nix/profileOverlays.nix); }) else (import ./pinned-nixpkgs.nix { });
-in
+{ onNixOS, devBuild, profileBuild ? false, pkgs }:
 pkgs.callPackage ./Simula.nix { onNixOS = onNixOS; devBuild = devBuild; profileBuild = profileBuild; pkgs = pkgs; }