diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2019-01-06 12:04:08 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2019-01-09 21:10:21 +0300 |
| commit | c680c57a84094476ad885ee8da0a58f6605ab436 (patch) | |
| tree | 9e75c7b86b8d48adacee2bec8d69217f91086108 /pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix | |
| parent | df834ee56d8c2ba5f75eae872e4dedc037874a61 (diff) | |
| download | nixpkgs-c680c57a84094476ad885ee8da0a58f6605ab436.tar nixpkgs-c680c57a84094476ad885ee8da0a58f6605ab436.tar.gz nixpkgs-c680c57a84094476ad885ee8da0a58f6605ab436.tar.bz2 nixpkgs-c680c57a84094476ad885ee8da0a58f6605ab436.tar.lz nixpkgs-c680c57a84094476ad885ee8da0a58f6605ab436.tar.xz nixpkgs-c680c57a84094476ad885ee8da0a58f6605ab436.tar.zst nixpkgs-c680c57a84094476ad885ee8da0a58f6605ab436.zip | |
bitwig-studio: switch to autoPatchelfHook
Diffstat (limited to 'pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix')
| -rw-r--r-- | pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix | 18 |
1 files changed, 7 insertions, 11 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 |