diff options
author | Arnout Engelen <arnout@bzzt.net> | 2020-12-21 21:37:28 +0100 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-02-17 07:30:16 -0800 |
commit | dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc (patch) | |
tree | 967f508911b5d1b0f3bf4522b9e3a6dbfbf5d243 /pkgs/applications/editors/jetbrains | |
parent | 89b06df73df86aafe12083eb1149501430ec59a3 (diff) | |
download | nixpkgs-dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc.tar nixpkgs-dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc.tar.gz nixpkgs-dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc.tar.bz2 nixpkgs-dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc.tar.lz nixpkgs-dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc.tar.xz nixpkgs-dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc.tar.zst nixpkgs-dc0e2bfd78a0da76d3d49ee9330cf60cbffb66bc.zip |
jetbrains: replace overrideDerivation with overrideAttr
This fixes error-checking of function arguments ( https://nixos.org/manual/nixpkgs/stable/#sec-pkg-overrideDerivation), notably checking the license (https://github.com/NixOS/nixpkgs/issues/107250)
Diffstat (limited to 'pkgs/applications/editors/jetbrains')
-rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c2415cf4f21..fc6b819836a 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -12,7 +12,7 @@ let # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "CLion"; meta = with lib; { @@ -25,7 +25,7 @@ let maintainers = with maintainers; [ edwtjo mic92 ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' ( cd $out/clion-${version} @@ -97,7 +97,7 @@ let }); buildGoland = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Goland"; meta = with lib; { @@ -112,7 +112,7 @@ let maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv @@ -202,7 +202,7 @@ let }; buildRider = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Rider"; meta = with lib; { @@ -219,7 +219,7 @@ let maintainers = [ maintainers.miltador ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ @@ -241,7 +241,7 @@ let }); buildWebStorm = { name, version, src, license, description, wmClass, ... }: - lib.overrideDerivation (mkJetBrainsProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; meta = with lib; { @@ -255,7 +255,7 @@ let maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; - }) (attrs: { + }).overrideAttrs (attrs: { patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' # Webstorm tries to use bundled jre if available. # Lets prevent this for the moment |