public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jetbrains: replace overrideDerivation with overrideAttr

Browse Source 
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)
This commit is contained in:
Arnout Engelen 2020-12-21 21:37:28 +01:00 committed by Jonathan Ringer
parent 89b06df73d
commit dc0e2bfd78
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/editors/jetbrains/default.nix
View File

@ -12,7 +12,7 @@ let
# Sorted alphabetically # Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass, ... }: buildClion = { name, version, src, license, description, wmClass, ... }:
lib.overrideDerivation (mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "CLion"; product = "CLion";
meta = with lib; { meta = with lib; {
@ -25,7 +25,7 @@ let
maintainers = with maintainers; [ edwtjo mic92 ]; maintainers = with maintainers; [ edwtjo mic92 ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}) (attrs: { }).overrideAttrs (attrs: {
postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
( (
cd $out/clion-${version} cd $out/clion-${version}
@ -97,7 +97,7 @@ let
}); });
buildGoland = { name, version, src, license, description, wmClass, ... }: buildGoland = { name, version, src, license, description, wmClass, ... }:
lib.overrideDerivation (mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "Goland"; product = "Goland";
meta = with lib; { meta = with lib; {
@ -112,7 +112,7 @@ let
maintainers = [ maintainers.miltador ]; maintainers = [ maintainers.miltador ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}) (attrs: { }).overrideAttrs (attrs: {
postFixup = (attrs.postFixup or "") + '' postFixup = (attrs.postFixup or "") + ''
interp="$(cat $NIX_CC/nix-support/dynamic-linker)" interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv
@ -202,7 +202,7 @@ let
}; };
buildRider = { name, version, src, license, description, wmClass, ... }: buildRider = { name, version, src, license, description, wmClass, ... }:
lib.overrideDerivation (mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "Rider"; product = "Rider";
meta = with lib; { meta = with lib; {
@ -219,7 +219,7 @@ let
maintainers = [ maintainers.miltador ]; maintainers = [ maintainers.miltador ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}) (attrs: { }).overrideAttrs (attrs: {
patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
rm -rf lib/ReSharperHost/linux-x64/dotnet rm -rf lib/ReSharperHost/linux-x64/dotnet
mkdir -p lib/ReSharperHost/linux-x64/dotnet/ mkdir -p lib/ReSharperHost/linux-x64/dotnet/
@ -241,7 +241,7 @@ let
}); });
buildWebStorm = { name, version, src, license, description, wmClass, ... }: buildWebStorm = { name, version, src, license, description, wmClass, ... }:
lib.overrideDerivation (mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "WebStorm"; product = "WebStorm";
meta = with lib; { meta = with lib; {
@ -255,7 +255,7 @@ let
maintainers = with maintainers; [ abaldeau ]; maintainers = with maintainers; [ abaldeau ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}) (attrs: { }).overrideAttrs (attrs: {
patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
# Webstorm tries to use bundled jre if available. # Webstorm tries to use bundled jre if available.
# Lets prevent this for the moment # Lets prevent this for the moment