Commit dc0e2bfd authored by Arnout Engelen's avatar Arnout Engelen Committed by Jonathan Ringer
Browse files

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)
parent 89b06df7

pkgs/applications/editors/jetbrains/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -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