From dd71d7b44b99837ec95fa69cfb0f7d5bd37e53d9 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 8 Mar 2015 11:14:02 +0100 Subject: tuxguitar in $out/bin/ folder Tuxguitar was installed in $out (as per default wrapper script) Thus installing tuxguitar was not in ~/.nix-profile when installed. Now tuxguitar appears in ~/.nix-profile when installed. --- pkgs/applications/editors/music/tuxguitar/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/editors/music') diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 81c7d2e3e1ed..09d30ad4e17a 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -17,13 +17,17 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out - cp -r * $out/ + mkdir -p $out/bin + cp -r lib share $out/ + cp tuxguitar $out/bin/tuxguitar + cp tuxguitar.jar $out/lib - wrapProgram $out/tuxguitar \ + ln -s $out/share $out/bin/share + + wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "${swt}/lib:${alsaLib}/lib" \ - --prefix CLASSPATH : "${swt}/jars/swt.jar" + --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib}/lib" \ + --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; meta = with stdenv.lib; { -- cgit 1.4.1