Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ca7f80ce5454
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8dc3b0286322
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 2, 2020

  1. Copy the full SHA
    a41a6a8 View commit details
  2. Merge pull request #102485 from IvarWithoutBones/intel-media-sdk-20.3.1

    intel-media-sdk: 20.2.1 -> 20.3.1
    danieldk authored Nov 2, 2020
    Copy the full SHA
    8dc3b02 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/development/libraries/intel-media-sdk/default.nix
12 changes: 7 additions & 5 deletions pkgs/development/libraries/intel-media-sdk/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11
, libXau, libXdmcp, libpthreadstubs }:

stdenv.mkDerivation rec {
pname = "intel-media-sdk";
version = "20.2.1";
version = "20.3.1";

src = fetchurl {
url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
sha256 = "0m3ipfdknpgrdwiywlinl4sfkfrvyv7wmq1j83pmbr54z067sgg1";
src = fetchFromGitHub {
owner = "Intel-Media-SDK";
repo = "MediaSDK";
rev = "intel-mediasdk-${version}";
sha256 = "13b698zp9b228x81yly0qx3zvj821niz3yad74b229i3z7rf8wzd";
};

nativeBuildInputs = [ cmake pkgconfig ];