From e62e20249fb34192ba0979efae62ab0ec13aa5da Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 28 Nov 2024 22:09:29 +0100 Subject: [PATCH] android-studio: fix fhsenv version --- .../editors/android-studio-for-platform/common.nix | 3 ++- pkgs/applications/editors/android-studio/common.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix index b0e7e1c839a4..049a5600d684 100644 --- a/pkgs/applications/editors/android-studio-for-platform/common.nix +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -130,7 +130,8 @@ let # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. fhsEnv = buildFHSEnv { - name = "${drvName}-fhs-env"; + pname = "${drvName}-fhs-env"; + inherit version; multiPkgs = pkgs: [ zlib ncurses5 diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 33c9bd77aef1..a3e5f4cc3e52 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -208,7 +208,8 @@ let # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. fhsEnv = buildFHSEnv { - name = "${drvName}-fhs-env"; + pname = "${drvName}-fhs-env"; + inherit version; multiPkgs = pkgs: [ ncurses5