Merge pull request #76 from jhol/openwrt

Fixes to OpenWRT environment
nix-community · Aug 16, 2024 · 2894b1a · 2894b1a
2 parents 548b953 + 91a25a8
commit 2894b1a
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/envs/openwrt/shell.nix b/envs/openwrt/shell.nix
@@ -16,29 +16,29 @@ let
   fhs = pkgs.buildFHSUserEnv {
     name = "openwrt-env";
     targetPkgs = pkgs: with pkgs; [
+      binutils
+      file
+      fixWrapper
+      gcc
       git
-      perl
+      glibc.static
       gnumake
-      gcc
+      ncurses
+      openssl
+      patch
+      perl
+      pkg-config
+      (python3.withPackages (ps: [ ps.setuptools ]))
+      rsync
+      subversion
+      swig
+      systemd
       unzip
       util-linux
-      python3
-      rsync
-      patch
       wget
-      file
-      subversion
       which
-      pkg-config
-      openssl
-      fixWrapper
-      systemd
-      binutils
-
-      ncurses
       zlib
       zlib.static
-      glibc.static
     ] ++ extraPkgs;
     multiPkgs = null;
     extraOutputsToInstall = [ "dev" ];