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: 3de2a6aace8c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da27632fd211
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 27, 2019

  1. vcv-rack: Fix issues from missing upstream dependency 

    The revision of the glfw fork that Rack depends on has been removed from
GitHub. This causes cloning of the glfw submodule for the Rack git
repository to fail.

As the glfw fork just adds a function that is only needed on Darwin (and
we don't support that platform at the moment) we remove the function
call from the Rack source. We can then use the upstream version of glfw.

We fetch the rest of the submodules manually as well.

See #71189 for the context.

(cherry picked from commit 0347078)
    @Moredread @Lassulus
    Moredread authored and Lassulus committed Oct 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    da27632 View commit details
54 changes: 41 additions & 13 deletions pkgs/applications/audio/vcv-rack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,16 +7,11 @@ let
name = "glfw-git-${version}";
version = "2019-06-30";
src = fetchFromGitHub {
owner = "AndrewBelt";
owner = "glfw";
repo = "glfw";
rev = "d9ab59efc781c392128a449361a381fcc93cf6f3";
sha256 = "1ykkq6qq8y6j5hlfj2zp1p87kr33vwhywziprz20v5avx1q7rjm8";
rev = "d25248343e248337284dfbe5ecd1eddbd37ae66d";
sha256 = "0gbz353bfmqbpm0af2nqf5draz3k4f3lqwiqj68s8nwn7878aqm3";
};
# 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 {
@@ -25,6 +20,30 @@ let
rev = "29e4f76ac53bef048938754f32231d7836401f79";
sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1";
};
nanovg-source = fetchFromGitHub {
owner = "memononen";
repo = "nanovg";
rev = "1f9c8864fc556a1be4d4bf1d6bfe20cde25734b4";
sha256 = "08r15zrr6p1kxigxzxrg5rgya7wwbdx7d078r362qbkmws83wk27";
};
nanosvg-source = fetchFromGitHub {
owner = "memononen";
repo = "nanosvg";
rev = "25241c5a8f8451d41ab1b02ab2d865b01600d949";
sha256 = "114qgfmazsdl53rm4pgqif3gv8msdmfwi91lyc2jfadgzfd83xkg";
};
osdialog-source = fetchFromGitHub {
owner = "AndrewBelt";
repo = "osdialog";
rev = "e5db5de6444f4b2c4e1390c67b3efd718080c3da";
sha256 = "0iqxn1md053nl19hbjk8rqsdcmjwa5l5z0ci4fara77q43rc323i";
};
oui-blendish-source = fetchFromGitHub {
owner = "AndrewBelt";
repo = "oui-blendish";
rev = "79ec59e6bc7201017fc13a20c6e33380adca1660";
sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64";
};
in
with stdenv.lib; stdenv.mkDerivation rec {
pname = "VCV-Rack";
@@ -34,17 +53,26 @@ with stdenv.lib; stdenv.mkDerivation rec {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx";
fetchSubmodules = true;
sha256 = "1wm41jkdm3dacl1n7q65lp3a4a5n2pz1wgb559hingfa2h0cwvsw";
};

patches = [ ./rack-minimize-vendoring.patch ];
patches = [
./rack-minimize-vendoring.patch
# We patch out a call to a custom function, that is not needed on Linux.
# This avoids needing a patched version of glfw. The version we previously used disappeared
# on GitHub. See https://github.com/NixOS/nixpkgs/issues/71189
./remove-custom-glfw-function.patch
];

prePatch = ''
cp -r ${pfft-source} dep/jpommier-pffft-source
mkdir -p dep/include
cp -r ${pfft-source} dep/jpommier-pffft-source
cp -r ${nanovg-source}/* dep/nanovg
cp -r ${nanosvg-source}/* dep/nanosvg
cp -r ${osdialog-source}/* dep/osdialog
cp -r ${oui-blendish-source}/* dep/oui-blendish
cp dep/jpommier-pffft-source/*.h dep/include
cp dep/nanosvg/**/*.h dep/include
cp dep/nanovg/src/*.h dep/include
13 changes: 0 additions & 13 deletions pkgs/applications/audio/vcv-rack/glfw.patch
View file

This file was deleted.

16 changes: 16 additions & 0 deletions pkgs/applications/audio/vcv-rack/remove-custom-glfw-function.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/src/main.cpp b/src/main.cpp
index 0954ae6..a8299f7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -162,11 +162,6 @@ int main(int argc, char* argv[]) {
INFO("Initializing app");
appInit();

- const char* openedFilename = glfwGetOpenedFilename();
- if (openedFilename) {
- patchPath = openedFilename;
- }
-
if (!settings::headless) {
APP->patch->init(patchPath);
}