From b092919a535b5ad9b00da51731be7331b5c11a13 Mon Sep 17 00:00:00 2001 From: schweby Date: Wed, 9 Jun 2021 21:58:06 +0000 Subject: [PATCH] nixda:update desktopvideo to 12.0 --- pkgs/blackmagic-desktop-video/default.nix | 12 ++++---- pkgs/decklink/default.nix | 37 ++++++++++------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/pkgs/blackmagic-desktop-video/default.nix b/pkgs/blackmagic-desktop-video/default.nix index 84a5dc3..9769a50 100644 --- a/pkgs/blackmagic-desktop-video/default.nix +++ b/pkgs/blackmagic-desktop-video/default.nix @@ -4,21 +4,21 @@ stdenv.mkDerivation rec { pname = "blackmagic-desktop-video"; - version = "11.6"; + version = "12.0"; buildInputs = [ libcxx libcxxabi ]; src = requireFile { - name = "Blackmagic_Desktop_Video_Linux_11.6.tar.gz"; - url = "https://www.blackmagicdesign.com/support/download/d399ada95c2b49ffad3031bda413acb5/Linux"; - sha256 = "0qwm1b3gy0k7j1bimkxwwr77g8hrsybs9jp90b46kzcy06mcp380"; + name = "Blackmagic_Desktop_Video_Linux_12.0.tar.gz"; + url = "https://www.blackmagicdesign.com/support/download/76b2edbed5884e1dbbfea104071f1643/Linux"; + sha256 = "e5a586ee705513cf5e6b024e1ec68621ab91d50b370981023e0bff73a19169c2"; }; setSourceRoot = '' - tar xf Blackmagic_Desktop_Video_Linux_11.6/other/x86_64/desktopvideo-11.6a26-x86_64.tar.gz - sourceRoot=$NIX_BUILD_TOP/desktopvideo-11.6a26-x86_64 + tar xf Blackmagic_Desktop_Video_Linux_12.0/other/x86_64/desktopvideo-12.0a14-x86_64.tar.gz + sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.0a14-x86_64 ''; installPhase = '' diff --git a/pkgs/decklink/default.nix b/pkgs/decklink/default.nix index 38988c7..dc26e70 100644 --- a/pkgs/decklink/default.nix +++ b/pkgs/decklink/default.nix @@ -2,29 +2,24 @@ stdenv.mkDerivation rec { pname = "decklink"; - version = "11.6"; + version = "12.0"; src = requireFile { - name = "Blackmagic_Desktop_Video_Linux_11.6.tar.gz"; - url = "https://www.blackmagicdesign.com/support/download/d399ada95c2b49ffad3031bda413acb5/Linux"; - sha256 = "0qwm1b3gy0k7j1bimkxwwr77g8hrsybs9jp90b46kzcy06mcp380"; + name = "Blackmagic_Desktop_Video_Linux_12.0.tar.gz"; + url = "https://www.blackmagicdesign.com/support/download/76b2edbed5884e1dbbfea104071f1643/Linux"; + sha256 = "e5a586ee705513cf5e6b024e1ec68621ab91d50b370981023e0bff73a19169c2"; }; patches = [ (fetchpatch { - name = "01-fix-makefile.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/01-fix-makefile.patch?h=decklink&id=8f19ef584c0603105415160d2ba4e8dfa47495ce"; - sha256 = "1pk8zfi0clmysla25jmcqnq7sx2bnjflrarhqkqbkl8crigyspf5"; + name = "01-fix-get_user_pages.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/01-fix-get_user_pages.patch?h=decklink&id=212ec426d96db3de0fedad803238d0604cc4df76"; + sha256 = "193199d59kmwdajhyw9k98636lbxrxwnxwlbhhijp1qms6y1qn2j"; }) (fetchpatch { - name = "02-fix-get_user_pages-and-mmap_lock.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/02-fix-get_user_pages-and-mmap_lock.patch?h=decklink&id=8f19ef584c0603105415160d2ba4e8dfa47495ce"; - sha256 = "08m4qwrk0vg8rix59y591bjih95d2wp6bmm1p37nyfvhi2n9jw2m"; - }) - (fetchpatch { - name = "03-fix-have_unlocked_ioctl.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/03-fix-have_unlocked_ioctl.patch?h=decklink&id=8f19ef584c0603105415160d2ba4e8dfa47495ce"; - sha256 = "0j9p62qa4mc6ir2v4fzrdapdrvi1dabrjrx1c295pwa3vmsi1x4f"; + name = "02-fix-have_unlocked_ioctl.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/02-fix-have_unlocked_ioctl.patch?h=decklink&id=212ec426d96db3de0fedad803238d0604cc4df76"; + sha256 = "0yf3bwry28zr1yfnx6wyh650d8kac4q70x95kz4p7sr6r7ajwzdm"; }) ]; @@ -34,15 +29,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; setSourceRoot = '' - tar xf Blackmagic_Desktop_Video_Linux_11.6/other/x86_64/desktopvideo-11.6a26-x86_64.tar.gz - sourceRoot=$NIX_BUILD_TOP/desktopvideo-11.6a26-x86_64/usr/src + tar xf Blackmagic_Desktop_Video_Linux_12.0/other/x86_64/desktopvideo-12.0a14-x86_64.tar.gz + sourceRoot=$NIX_BUILD_TOP/desktopvideo-12.0a14-x86_64/usr/src ''; buildPhase = '' runHook preBuild - make -C $sourceRoot/blackmagic-11.6a26 -j$NIX_BUILD_CORES - make -C $sourceRoot/blackmagic-io-11.6a26 -j$NIX_BUILD_CORES + make -C $sourceRoot/blackmagic-12.0a14 -j$NIX_BUILD_CORES + make -C $sourceRoot/blackmagic-io-12.0a14 -j$NIX_BUILD_CORES runHook postBuild ''; @@ -50,8 +45,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - make -C $KERNELDIR M=$sourceRoot/blackmagic-11.6a26 modules_install - make -C $KERNELDIR M=$sourceRoot/blackmagic-io-11.6a26 modules_install + make -C $KERNELDIR M=$sourceRoot/blackmagic-12.0a14 modules_install + make -C $KERNELDIR M=$sourceRoot/blackmagic-io-12.0a14 modules_install runHook postInstall '';