Replace coreutils-full with busybox; explicitly list GNU dependencies…

… under propagatedBuildInputs
The-OpenROAD-Project · Apr 8, 2024 · 74cc8ee · 74cc8ee
1 parent 209f996
commit 74cc8ee
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/default.nix b/default.nix
@@ -9,6 +9,9 @@
   coreutils-full,
   gnugrep,
   gnused,
+  gnutar,
+  gzip,
+  git,
   bash,
   klayout-pymod
 }:
@@ -52,6 +55,9 @@ in
       gnugrep
       gnused
       bash
+      gnutar
+      gzip
+      git
     ];
 
     nativeBuildInputs = [makeWrapper];

diff --git a/docker/docker.nix b/docker/docker.nix
@@ -17,13 +17,10 @@
   python3,
   openlane1,
   system,
-  coreutils-full,
   findutils,
+  busybox,
   bashInteractive,
-  gnugrep,
-  gnused,
   gnumake,
-  gnutar,
   gdb,
   lldb,
   which,
@@ -56,14 +53,10 @@ in
       name = "image-root";
       paths = [
         # Base OS
-        ## GNU
-        coreutils-full
+        ## POSIX
         findutils
         bashInteractive
-        gnugrep
-        gnused
-        gnutar
-        gnumake
+        busybox
         which
 
         ## Networking

diff --git a/flake.nix b/flake.nix
@@ -63,14 +63,12 @@
       }
       // (pkgs.lib.optionalAttrs (pkgs.stdenv.isLinux) {openlane1-docker = callPackage ./docker/docker.nix {};}));
 
-    devShells = self.forAllSystems (
-      pkgs: let
-        callPackage = pkgs.lib.callPackageWith (pkgs // self.packages.${pkgs.system});
-        callPythonPackage = pkgs.lib.callPackageWith (pkgs // pkgs.python3.pkgs // self.packages.${pkgs.system});
-      in rec {
-        default = callPackage (self.createOpenLaneShell {
-        }) {};
-      }
-    );
+    # devShells = self.forAllSystems (
+    #   pkgs: let
+    #     callPackage = pkgs.lib.callPackageWith (pkgs // self.packages.${pkgs.system});
+    #     callPythonPackage = pkgs.lib.callPackageWith (pkgs // pkgs.python3.pkgs // self.packages.${pkgs.system});
+    #   in rec {
+    #   }
+    # );
   };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,9 @@ @@
       coreutils-full,
       gnugrep,
       gnused,
+      gnutar,
+      gzip,
+      git,
       bash,
       klayout-pymod
     }:
@@ Expand Down Expand Up / @@ -52,6 +55,9 @@ in @@
           gnugrep
           gnused
           bash
+          gnutar
+          gzip
+          git
         ];
         nativeBuildInputs = [makeWrapper];
@@ Expand Down @@