diff options
author | Lassulus <github@lassul.us> | 2021-01-01 00:32:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-01 00:32:32 +0100 |
commit | 0dfc8139e250968545e60089fad46994df2020d1 (patch) | |
tree | b6b7c06c7c9ff3f0b8daa5a1257e7ba5210e99d0 | |
parent | 19a6bd344c1e978e1f6a92930c74e0a79504fcc3 (diff) | |
parent | 0863300f1739f7b598f58972e1fa9e04d15f30da (diff) |
Merge pull request #107630 from bfortz/bitwig-3.3.1
Bitwig Studio : 3.2.8 -> 3.3.1
-rw-r--r-- | pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 80 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 69 insertions, 16 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 6841cd6e75d9..1e2a61a169af 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,23 +1,77 @@ -{ fetchurl, bitwig-studio1, pulseaudio, libjack2, xorg }: +{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype +, gdk-pixbuf, glib, gtk3, lib, xorg +, libglvnd, libjack2, ffmpeg_3 +, libxkbcommon, xdg_utils, zlib, pulseaudio +, wrapGAppsHook, makeWrapper }: -bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; - version = "3.2.8"; +stdenv.mkDerivation rec { + pname = "bitwig-studio"; + version = "3.3.1"; src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "18ldgmnv7bigb4mch888kjpf4abalpiwmlhwd7rjb9qf6p72fhpj"; + url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; + sha256 = "0f7xysk0cl48q7i28m25hasmrp30grgm3kah0s7xmkjgm33887pi"; }; - buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; - runtimeDependencies = [ pulseaudio libjack2 ]; + unpackCmd = '' + mkdir -p root + dpkg-deb -x $curSrc root + ''; + + dontBuild = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + + buildInputs = with xorg; [ + alsaLib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + ]; + + binPath = lib.makeBinPath [ + xdg_utils ffmpeg_3 + ]; + + ldLibraryPath = lib.strings.makeLibraryPath buildInputs; installPhase = '' - ${oldAttrs.installPhase} + mkdir -p $out/bin + cp -r opt/bitwig-studio $out/libexec + ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio + cp -r usr/share $out/share + substitute usr/share/applications/bitwig-studio.desktop \ + $out/share/applications/bitwig-studio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + ''; + + postFixup = '' + # patchelf fails to set rpath on BitwigStudioEngine, so we use + # the LD_LIBRARY_PATH way + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -name '*.jar' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + wrapProgram $f \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : "${ldLibraryPath}" + done - # recover commercial jre - rm -f $out/libexec/lib/jre - cp -r opt/bitwig-studio/lib/jre $out/libexec/lib ''; -}) + + meta = with stdenv.lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = "https://www.bitwig.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz michalrus mrVanDalo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a103b85a1e..a37741c0cc43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20639,9 +20639,8 @@ in bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (pkgs) bitwig-studio1; }; - bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { - inherit (pkgs) bitwig-studio1; - }; + bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; + bitwig-studio = bitwig-studio3; bgpdump = callPackage ../tools/networking/bgpdump { }; |