public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33310 from mrVanDalo/feature/bitwig-split

Browse Source 
bitwig-studio: refactor to support older major versions

Resolves #32206.
This commit is contained in:
Yegor Timoshenko
2018-01-02 08:26:42 +03:00
committed by GitHub
parent 866c511a0a b7387e1db8
commit e8adb894d4
3 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/bitwig-studio/default.nix → pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+16 -16
View File
@@ -1,35 +1,35 @@
{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp , glib, gtk2, harfbuzz, jdk, lib, xorg
, libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb , libbsd, libjack2, libpng
, libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm , libxkbcommon
, makeWrapper, pixman
, xdg_utils, zenity, zlib }: , xdg_utils, zenity, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bitwig-studio-${version}"; name = "bitwig-studio-${version}";
version = "2.2.2"; version = "1.3.16";
src = fetchurl { src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8";
}; };
nativeBuildInputs = [ dpkg makeWrapper ]; nativeBuildInputs = [ dpkg makeWrapper ];
unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root";
dontBuild = true; dontBuild = true;
dontPatchELF = true; dontPatchELF = true;
dontStrip = true; dontStrip = true;
libPath = lib.makeLibraryPath [ libPath = with xorg; lib.makeLibraryPath [
alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau
libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb
libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm libxkbfile pixman xcbutil xcbutilwm zlib
zlib
]; ];
binPath = lib.makeBinPath [ binPath = lib.makeBinPath [
ffmpeg xdg_utils zenity xdg_utils zenity
]; ];
installPhase = '' installPhase = ''
@@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
homepage = http://www.bitwig.com/; homepage = http://www.bitwig.com/;
license = licenses.unfree; license = licenses.unfree;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ michalrus ]; maintainers = with maintainers; [ michalrus mrVanDalo ];
}; };
} }
pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
+18
View File
@@ -0,0 +1,18 @@
{ stdenv, fetchurl, bitwig-studio1,
xdg_utils, zenity, ffmpeg }:
bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}";
version = "2.2.2";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22";
};
buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ];
binPath = stdenv.lib.makeBinPath [
ffmpeg xdg_utils zenity
];
})
pkgs/top-level/all-packages.nix
+6 -1
View File
@@ -14191,9 +14191,14 @@ with pkgs;
bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { }; bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { };
bitwig-studio = callPackage ../applications/audio/bitwig-studio { bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix {
inherit (gnome2) zenity; inherit (gnome2) zenity;
}; };
bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
inherit (gnome2) zenity;
inherit (self) bitwig-studio1;
};
bitwig-studio = bitwig-studio2;
bgpdump = callPackage ../tools/networking/bgpdump { }; bgpdump = callPackage ../tools/networking/bgpdump { };