Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 24894fbc69a8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e22dd9ee8a8
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 19, 2018

  1. jogl: init at 2.3.2

    volth committed Mar 19, 2018
    Copy the full SHA
    94ff822 View commit details
  2. jogl: temporary workaround for openjdk8

    volth committed Mar 19, 2018
    Copy the full SHA
    887e630 View commit details
  3. gephi: build from sources

    volth committed Mar 19, 2018
    Copy the full SHA
    1e2eec1 View commit details
  4. Merge pull request #37356 from volth/gephi-from-sources

    gephi: build from sources
    Mic92 authored Mar 19, 2018
    Copy the full SHA
    6e22dd9 View commit details
Showing with 117 additions and 27 deletions.
  1. +54 −27 pkgs/applications/science/misc/gephi/default.nix
  2. +60 −0 pkgs/development/java-modules/jogl/default.nix
  3. +3 −0 pkgs/top-level/java-packages.nix
81 changes: 54 additions & 27 deletions pkgs/applications/science/misc/gephi/default.nix
Original file line number Diff line number Diff line change
@@ -1,37 +1,64 @@
{stdenv, fetchurl, jdk}:
{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }:

with stdenv.lib;
let
version = "0.9.2";

let version = "0.9.2"; in
stdenv.mkDerivation {
name = "gephi-${version}";

src = fetchurl {
url = "https://github.com/gephi/gephi/releases/download/v${version}/gephi-${version}-linux.tar.gz";
sha256 = "1wr3rka8j2y10nnwbg27iaxkbrp4d7d07ccs9n94yqv6wqawj5z8";
src = fetchFromGitHub {
owner = "gephi";
repo = "gephi";
rev = "v${version}";
sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r";
};

meta = {
inherit version;
description = "A platform for visualizing and manipulating large graphs";
homepage = https://gephi.org;
license = licenses.gpl3;
maintainers = [maintainers.taeer];
platforms = platforms.linux;
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
deps = stdenv.mkDerivation {
name = "gephi-${version}-deps";
inherit src;
buildInputs = [ jdk maven ];
buildPhase = ''
while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
echo "timeout, restart maven to continue downloading"
done
'';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif";
};
in
stdenv.mkDerivation rec {
name = "gephi-${version}";

inherit src;

buildInputs = [jdk];
buildInputs = [ jdk maven ];

configurePhase = "
echo \"jdkhome=${jdk}\" >> etc/gephi.conf
";
buildPhase = ''
# 'maven.repo.local' must be writable so copy it out of nix store
mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
'';

dontBuild = true;
installPhase = ''
cp -r modules/application/target/gephi $out
installPhase = "
mkdir $out
for a in ./*; do
mv $a $out
done
";
# remove garbage
find $out -type f -name .lastModified -delete
find $out -type f -regex '.+\.exe' -delete
# use self-compiled JOGL to avoid patchelf'ing .so inside jars
rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar
cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
echo "jdkhome=${jdk}" >> $out/etc/gephi.conf
'';

meta = with stdenv.lib; {
description = "A platform for visualizing and manipulating large graphs";
homepage = https://gephi.org;
license = licenses.gpl3;
maintainers = [ maintainers.taeer ];
platforms = [ "x86_64-linux" ];
};
}
60 changes: 60 additions & 0 deletions pkgs/development/java-modules/jogl/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }:

let
# workaround https://github.com/NixOS/nixpkgs/issues/37364
jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
in
{
jogl_2_3_2 =
let
version = "2.3.2";

gluegen-src = fetchgit {
url = git://jogamp.org/srv/scm/gluegen.git;
rev = "v${version}";
sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
fetchSubmodules = true;
};
in stdenv.mkDerivation rec {
name = "jogl-${version}";

src = fetchgit {
url = http://jogamp.org/srv/scm/jogl.git;
rev = "v${version}";
sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3";
fetchSubmodules = true;
};

buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];

buildPhase = ''
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
chmod -R +w $NIX_BUILD_TOP/gluegen
( cd ../gluegen/make
ant )
( cd make
# force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
# if arm/aarch64 support will be added, this block might be commented out on those platforms
# on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
cp build-newt.xml build-newt.xml.old
fgrep -v 'if="setup.addNativeBroadcom"' build-newt.xml.old > build-newt.xml
ant )
'';

installPhase = ''
mkdir -p $out/share/java
cp $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/
'';

meta = with stdenv.lib; {
description = "Java libraries for 3D Graphics, Multimedia and Processing";
homepage = http://jogamp.org/;
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
};
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/java-packages.nix
Original file line number Diff line number Diff line change
@@ -61,6 +61,9 @@ in {
junit_3_8_2
junit_4_12;

inherit (callPackage ../development/java-modules/jogl { })
jogl_2_3_2;

inherit (callPackage ../development/java-modules/log4j { inherit fetchMaven; })
log4j_1_2_12;