diff --git a/overlays/android-studio.nix b/overlays/android-studio.nix deleted file mode 100644 index ef9ca5e..0000000 --- a/overlays/android-studio.nix +++ /dev/null @@ -1,27 +0,0 @@ -self: { bash, buildFHSEnv, cacert, ncurses5, runCommand, ... } @ super: -let - drvName = super.android-studio.name; - fhsEnv = buildFHSEnv { - name = "${drvName}-fhs-env"; - # google's analytics calls jdk's getOperatingSystemMXBean which tries to parse cgroups and ultimately fails for whatever reason with an npe - unshareCgroup = false; - multiPkgs = pkgs: [ - ncurses5 - - (runCommand "fedoracert" {} - '' - mkdir -p $out/etc/pki/tls/ - ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs - '') - ]; - }; - - startScript = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${super.android-studio.passthru.unwrapped}/bin/studio.sh "$@" - ''; -in { - android-studio-patched = super.android-studio.overrideAttrs(_: { - inherit startScript; - }); -} diff --git a/overlays/default.nix b/overlays/default.nix index 752a2c8..31648cc 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,4 @@ builtins.map (path: import path) [ - ./android-studio.nix ./bitwarden-desktop.nix ./cascadia-code.nix ./ccache.nix