WIP: Tried using explicitPkgs

Which I think needs importing the functions in pkgs
ngi-nix · Mar 22, 2024 · 7c0fdd6 · 7c0fdd6
1 parent 479ea46
commit 7c0fdd6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -77,7 +77,6 @@
         inherit (pkgs) lib;
         inherit (pkgs) mkPnpmPackage;
         inherit callPackage dream2nix pkgs;
-        inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps pnpmConfigHook;
       };
 
       explicitPkgs = import ./pkgs {

diff --git a/pkgs/by-name/atomic-browser/package.nix → pkgs/atomic-browser/default.nix b/pkgs/by-name/atomic-browser/package.nix → pkgs/atomic-browser/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   lib,
   mkPnpmPackage,
@@ -12,7 +12,7 @@
     maintainers
     ;
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "atomic-browser";
   version = "v0.37.0";
 

diff --git a/pkgs/by-name/default.nix b/pkgs/by-name/default.nix
@@ -3,8 +3,6 @@
   callPackage,
   dream2nix,
   mkPnpmPackage,
-  fetchPnpmDeps,
-  pnpmConfigHook,
   pkgs,
 }: let
   baseDirectory = ./.;

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -33,6 +33,11 @@
       pretalx-venueless
       pretalx-public-voting
       ;
+
+
+      inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps;
+      inherit (callPackage ./pkgs/build-support/node/fetch-pnpm-deps { }) pnpmConfigHook;
+    atomic-browser = callPackage ./atomic-browser {};
   };
 in
   self