From 51957cea324b98cacaa411ac25f536d1ba75f7aa Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 7 Feb 2024 11:47:01 +0100 Subject: [PATCH 1/2] surge-XT: 1.2.3 -> 1.3.1 --- pkgs/applications/audio/surge-XT/default.nix | 28 +++----------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index ccd5ad12c0e8..63cf1110d784 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -14,37 +14,16 @@ , libXrandr }: -let - juce-lv2 = stdenv.mkDerivation { - pname = "juce-lv2"; - version = "unstable-2023-03-04"; - - # lv2 branch - src = fetchFromGitHub { - owner = "lv2-porting-project"; - repo = "JUCE"; - rev = "e825ad977cf4499a7bfa05b97b208236f8fd253b"; - sha256 = "sha256-Fqp1y9BN0E9p/12ukG1oh3COhXNRWBAlFRSl0LPyiFc="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - cp -r . $out - ''; - }; -in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "1.2.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-DGzdzoCjMGEDltEwlPvLk2tyMVRH1Ql2Iq1ypogw/m0="; + sha256 = "sha256-xcbZ5TC2W2PVzAkpoKPFIgW1oRGaC+ynQYot3cb5NAQ="; }; nativeBuildInputs = [ @@ -67,8 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DJUCE_SUPPORTS_LV2=ON" - "-DSURGE_JUCE_PATH=${juce-lv2}" + "-DSURGE_BUILD_LV2=TRUE" ]; CXXFLAGS = [ From eb092f16260678e025d89cf308c0e69b40ec8d39 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 12 Feb 2024 10:22:45 +0100 Subject: [PATCH 2/2] surge-XT: better version info * pkgs/applications/audio/surge-XT/default.nix: --- pkgs/applications/audio/surge-XT/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index 63cf1110d784..9f234b5e71c0 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , cmake +, gitMinimal , pkg-config , alsa-lib , freetype @@ -22,12 +23,15 @@ stdenv.mkDerivation rec { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; + branchName = "release-xt/${version}"; fetchSubmodules = true; - sha256 = "sha256-xcbZ5TC2W2PVzAkpoKPFIgW1oRGaC+ynQYot3cb5NAQ="; + leaveDotGit = true; + sha256 = "sha256-q6qs/OhIakF+Gc8Da3pnfkUGYDUoJbvee0o8dfrRI2U="; }; nativeBuildInputs = [ cmake + gitMinimal pkg-config ];