forked from mirrors/nixpkgs
bitwig-studio: fix crash when creating user color palette via importing a JPEG image (#201847)
This commit is contained in:
parent
41b390e0b3
commit
47fd756154
|
@ -1,8 +1,26 @@
|
||||||
{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype
|
{ stdenv
|
||||||
, gdk-pixbuf, glib, gtk3, lib, xorg
|
, fetchurl
|
||||||
, libglvnd, libjack2, ffmpeg
|
, alsa-lib
|
||||||
, libxkbcommon, xdg-utils, zlib, pipewire, pulseaudio
|
, cairo
|
||||||
, wrapGAppsHook, makeWrapper }:
|
, dpkg
|
||||||
|
, ffmpeg
|
||||||
|
, freetype
|
||||||
|
, gdk-pixbuf
|
||||||
|
, glib
|
||||||
|
, gtk3
|
||||||
|
, lib
|
||||||
|
, libglvnd
|
||||||
|
, libjack2
|
||||||
|
, libjpeg
|
||||||
|
, libxkbcommon
|
||||||
|
, makeWrapper
|
||||||
|
, pipewire
|
||||||
|
, pulseaudio
|
||||||
|
, wrapGAppsHook
|
||||||
|
, xdg-utils
|
||||||
|
, xorg
|
||||||
|
, zlib
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bitwig-studio";
|
pname = "bitwig-studio";
|
||||||
|
@ -24,7 +42,27 @@ stdenv.mkDerivation rec {
|
||||||
dontWrapGApps = true; # we only want $gappsWrapperArgs here
|
dontWrapGApps = true; # we only want $gappsWrapperArgs here
|
||||||
|
|
||||||
buildInputs = with xorg; [
|
buildInputs = with xorg; [
|
||||||
alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pipewire pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib
|
alsa-lib
|
||||||
|
cairo
|
||||||
|
freetype
|
||||||
|
gdk-pixbuf
|
||||||
|
glib
|
||||||
|
gtk3
|
||||||
|
libglvnd
|
||||||
|
libjack2
|
||||||
|
# libjpeg8 is required for converting jpeg's to colour palettes
|
||||||
|
libjpeg
|
||||||
|
libxcb
|
||||||
|
libXcursor
|
||||||
|
libX11
|
||||||
|
libXtst
|
||||||
|
libxkbcommon
|
||||||
|
pipewire
|
||||||
|
pulseaudio
|
||||||
|
stdenv.cc.cc.lib
|
||||||
|
xcbutil
|
||||||
|
xcbutilwm
|
||||||
|
zlib
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -27882,7 +27882,9 @@ with pkgs;
|
||||||
inherit bitwig-studio1;
|
inherit bitwig-studio1;
|
||||||
};
|
};
|
||||||
bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
|
bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
|
||||||
bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { };
|
bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix {
|
||||||
|
libjpeg = libjpeg.override { enableJpeg8 = true; };
|
||||||
|
};
|
||||||
|
|
||||||
bitwig-studio = bitwig-studio4;
|
bitwig-studio = bitwig-studio4;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue