From c680c57a84094476ad885ee8da0a58f6605ab436 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 6 Jan 2019 12:04:08 +0300 Subject: [PATCH 1/4] bitwig-studio: switch to autoPatchelfHook --- .../audio/bitwig-studio/bitwig-studio1.nix | 18 +++++++----------- .../audio/bitwig-studio/bitwig-studio2.nix | 8 +++----- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 8b26ba0959d..c59590d4821 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf -, glib, gtk2, harfbuzz, jdk, lib, xorg -, libbsd, libjack2, libpng +, glib, gtk2, gtk3, harfbuzz, jdk, lib, xorg +, libbsd, libjack2, libpng, ffmpeg , libxkbcommon -, makeWrapper, pixman +, makeWrapper, pixman, autoPatchelfHook , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; }; - nativeBuildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontStrip = true; - libPath = with xorg; lib.makeLibraryPath [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau + buildInputs = with xorg; [ + alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 gtk3 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib ]; binPath = lib.makeBinPath [ - xdg_utils zenity + xdg_utils zenity ffmpeg ]; installPhase = '' @@ -67,12 +67,8 @@ stdenv.mkDerivation rec { -not -name '*.so' \ -not -path '*/resources/*' | \ while IFS= read -r f ; do - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - $f && \ wrapProgram $f \ --prefix PATH : "${binPath}" \ - --prefix LD_LIBRARY_PATH : "${libPath}" \ --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true done diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 829bb4c67ca..bceb5ee174b 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bitwig-studio1, - xdg_utils, zenity, ffmpeg }: + xdg_utils, zenity, ffmpeg, pulseaudio }: bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; @@ -10,9 +10,7 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { sha256 = "1v62z08hqla8fz5m7hl9ynf2hpr0j0arm0nb5lpd99qrv36ibrsc"; }; - buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; - - binPath = stdenv.lib.makeBinPath [ - ffmpeg xdg_utils zenity + runtimeDependencies = [ + pulseaudio ]; }) From bce5c13a8fbcb297236bdacce4acabbffcd50900 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 8 Jan 2019 11:00:42 +0300 Subject: [PATCH 2/4] bitwig-studio2: 2.3.5 -> 2.4.3 --- pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index bceb5ee174b..0b7adefb305 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "2.3.5"; + version = "2.4.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1v62z08hqla8fz5m7hl9ynf2hpr0j0arm0nb5lpd99qrv36ibrsc"; + sha256 = "17754y4ni0zj9vjxl8ldivi33gdb0nk6sdlcmlpskgffrlx8di08"; }; runtimeDependencies = [ From ad2d03d7a267325f6c22b8e8c7967acd2668f454 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 27 Jan 2019 18:15:54 +0300 Subject: [PATCH 3/4] bitwig-studio: support native filesystem dialogs --- .../audio/bitwig-studio/bitwig-studio1.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index c59590d4821..020307b8944 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf -, glib, gtk2, gtk3, harfbuzz, jdk, lib, xorg +, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg , libbsd, libjack2, libpng, ffmpeg , libxkbcommon , makeWrapper, pixman, autoPatchelfHook @@ -14,16 +14,15 @@ stdenv.mkDerivation rec { sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; }; - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; dontBuild = true; - dontPatchELF = true; - dontStrip = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 gtk3 harfbuzz libX11 libXau + alsaLib bzip2.out cairo freetype gdk_pixbuf gtk2 gtk3 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib ]; @@ -69,6 +68,7 @@ stdenv.mkDerivation rec { while IFS= read -r f ; do wrapProgram $f \ --prefix PATH : "${binPath}" \ + "''${gappsWrapperArgs[@]}" \ --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true done From d8b08e7ea6e6147212ed1e4b1bb57d36773fed4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 30 Jan 2019 07:47:12 +0000 Subject: [PATCH 4/4] bitwig-studio: gappsWrapperArgs must read in postFixup They are not yet set in the installPhase. --- .../audio/bitwig-studio/bitwig-studio1.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 020307b8944..7a80fecab71 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -48,6 +48,16 @@ stdenv.mkDerivation rec { rm -rf $out/libexec/lib/jre ln -s ${jdk.home}/jre $out/libexec/lib/jre + mkdir -p $out/bin + 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 = '' # Bitwig’s `libx11-windowing-system.so` has several problems: # # • has some old version of libxkbcommon linked statically (ಠ_ಠ), @@ -71,14 +81,6 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" \ --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true done - - mkdir -p $out/bin - 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 ''; meta = with stdenv.lib; {