diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/applications/audio/bitwig-studio | |
parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/applications/audio/bitwig-studio')
-rw-r--r-- | nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix | 40 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix | 12 |
2 files changed, 24 insertions, 28 deletions
diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 8b26ba0959d4..7a80fecab718 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/nixpkgs/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 +, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg +, libbsd, libjack2, libpng, ffmpeg , libxkbcommon -, makeWrapper, pixman +, makeWrapper, pixman, autoPatchelfHook , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { @@ -14,22 +14,21 @@ stdenv.mkDerivation rec { sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; }; - nativeBuildInputs = [ dpkg makeWrapper ]; + 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 - 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 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 = '' @@ -49,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 (ಠ_ಠ), @@ -67,22 +76,11 @@ 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}" \ + "''${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; { diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 829bb4c67caa..0b7adefb3056 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, bitwig-studio1, - xdg_utils, zenity, ffmpeg }: + xdg_utils, zenity, ffmpeg, pulseaudio }: 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"; }; - buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; - - binPath = stdenv.lib.makeBinPath [ - ffmpeg xdg_utils zenity + runtimeDependencies = [ + pulseaudio ]; }) |