nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

idea: update 13.0.2 -> 13.1.1

Browse Source 
And use buildnumbers only in the buildscript and use more familiar
version numbers in the package name.

[bjorn.forsman@gmail.com: modify commit message]
This commit is contained in:
Edward Tjörnhammar 2014-02-22 23:42:11 +01:00 committed by Bjørn Forsman
parent 8cd858b100
commit 8af6b20856
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/editors/idea/default.nix
View File

@ -5,10 +5,10 @@
let let
buildIdea = buildIdea =
{ name, src, description, license }: { name, version, build, src, description, license }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit name src license; inherit name build src license;
ideaItem = makeDesktopItem { ideaItem = makeDesktopItem {
name = "IDEA"; name = "IDEA";
exec = "idea"; exec = "idea";
@ -23,26 +23,26 @@ let
buildCommand = '' buildCommand = ''
tar xvzf $src tar xvzf $src
mkdir -p $out mkdir -p $out
cp -a $name $out cp -a idea-$build $out
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
7z x $out/$name/lib/snappy-java-1.0.5.jar 7z x $out/idea-$build/lib/snappy-java-1.0.5.jar
rm $out/$name/lib/snappy-java-1.0.5.jar rm $out/idea-$build/lib/snappy-java-1.0.5.jar
if [ "${stdenv.system}" == "x86_64-linux" ];then if [ "${stdenv.system}" == "x86_64-linux" ];then
patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier64 patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier64
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
else else
patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier
patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so
fi fi
7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar . 7z a -tzip $out/idea-$build/lib/snappy-java-1.0.5.jar .
mkdir -p $out/bin mkdir -p $out/bin
jdk=${jdk}/lib/openjdk jdk=${jdk}/lib/openjdk
makeWrapper $out/$name/bin/idea.sh $out/bin/idea \ makeWrapper $out/idea-$build/bin/idea.sh $out/bin/idea \
--prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \ --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \
--prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \ --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \
--prefix JDK_HOME : $jdk \ --prefix JDK_HOME : $jdk \
@ -64,23 +64,27 @@ let
in { in {
idea_community_1302 = buildIdea { idea_community_1311 = buildIdea rec {
name = "idea-IC-133.696"; name = "idea-community-${version}";
version = "13.1.1";
build = "IC-135.480";
description = "IntelliJ IDEA 13 Community Edition"; description = "IntelliJ IDEA 13 Community Edition";
license = stdenv.lib.licenses.asl20.shortName; license = stdenv.lib.licenses.asl20.shortName;
src = fetchurl { src = fetchurl {
url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.2.tar.gz; url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53"; sha256 = "9e28d3e5682b037c9d6190622ab2a47112fa792539083cc7a4cb24f3f7bf7d22";
}; };
}; };
idea_ultimate_1302 = buildIdea { idea_ultimate_1311 = buildIdea rec {
name = "idea-IU-133.696"; name = "idea-ultimate-${version}";
version = "13.1.1";
build = "IU-135.480";
description = "IntelliJ IDEA 13 Ultimate Edition"; description = "IntelliJ IDEA 13 Ultimate Edition";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.2.tar.gz; url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0"; sha256 = "d699abcdcace387105a465049e015c1367dedf42f7a5f5a1f7b3d840e98b2658";
}; };
}; };