diff options
author | André-Patrick Bubel <code@andre-bubel.de> | 2019-07-10 13:14:24 +0200 |
---|---|---|
committer | Lassulus <github@lassul.us> | 2019-08-07 10:07:43 +0200 |
commit | b1bd9fc47fc3fe7c680ff4a83e36a2d0d5baa16a (patch) | |
tree | fd8bca830125e36b42c411af01460d79381329d4 /pkgs/applications/audio/vcv-rack/default.nix | |
parent | 965d055cbe2aba772cdb2e786a9c8b32afc241b2 (diff) |
vcv-rack: 0.6.2b -> 1.1.3
Diffstat (limited to 'pkgs/applications/audio/vcv-rack/default.nix')
-rw-r--r-- | pkgs/applications/audio/vcv-rack/default.nix | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 15935751c32aa..2e55306029f04 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -5,13 +5,18 @@ let glfw-git = glfw.overrideAttrs (oldAttrs: rec { name = "glfw-git-${version}"; - version = "unstable-2018-05-29"; + version = "2019-06-30"; src = fetchFromGitHub { - owner = "glfw"; + owner = "AndrewBelt"; repo = "glfw"; - rev = "0be4f3f75aebd9d24583ee86590a38e741db0904"; - sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5"; + rev = "d9ab59efc781c392128a449361a381fcc93cf6f3"; + sha256 = "1ykkq6qq8y6j5hlfj2zp1p87kr33vwhywziprz20v5avx1q7rjm8"; }; + # We patch the source to export a function that was added to the glfw fork + # for Rack so it is present when we build glfw as a shared library. + # See https://github.com/AndrewBelt/glfw/pull/1 for discussion of this issue + # with upstream. + patches = [ ./glfw.patch ]; buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ]; }); pfft-source = fetchFromBitbucket { @@ -23,32 +28,31 @@ let in with stdenv.lib; stdenv.mkDerivation rec { name = "VCV-Rack-${version}"; - version = "0.6.2b"; + version = "1.1.3"; src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6"; + sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2"; fetchSubmodules = true; }; + patches = [ ./rack-minimize-vendoring.patch ]; + prePatch = '' - ln -s ${pfft-source} dep/jpommier-pffft-source + cp -r ${pfft-source} dep/jpommier-pffft-source mkdir -p dep/include cp dep/jpommier-pffft-source/*.h dep/include - cp dep/nanosvg/src/*.h dep/include + cp dep/nanosvg/**/*.h dep/include cp dep/nanovg/src/*.h dep/include cp dep/osdialog/*.h dep/include cp dep/oui-blendish/*.h dep/include substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>" substituteInPlace compile.mk --replace "-march=nocona" "" - substituteInPlace Makefile \ - --replace "-Wl,-Bstatic" "" \ - --replace "-lglfw3" "-lglfw" ''; enableParallelBuilding = true; @@ -60,13 +64,12 @@ with stdenv.lib; stdenv.mkDerivation rec { installPhase = '' install -D -m755 -t $out/bin Rack - cp -r res $out/ - mkdir -p $out/share/rack - cp LICENSE.txt LICENSE-dist.txt $out/share/rack + mkdir -p $out/share/vcv-rack + cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack # Override the default global resource file directory - wrapProgram $out/bin/Rack --add-flags "-g $out" + wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack" ''; meta = with stdenv.lib; { |