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: ef521db57847
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6daa1938b694
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 19, 2018

  1. movit: 1.5.1 -> 1.6.2, fix build after #49310 

    Fixes #49883
    @orivej
    orivej committed Nov 19, 2018
    Copy the full SHA
    6daa193 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/development/libraries/movit/default.nix
12 changes: 7 additions & 5 deletions pkgs/development/libraries/movit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{ stdenv, fetchurl, SDL, eigen, epoxy, fftw, gtest, pkgconfig }:
{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:

stdenv.mkDerivation rec {
name = "movit-${version}";
version = "1.5.1";
version = "1.6.2";

src = fetchurl {
url = "https://movit.sesse.net/${name}.tar.gz";
sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
sha256 = "1q9h086v6h3da4b9qyflcjx73cgnqjhb92rv6g4j90m34dndaa3l";
};

outputs = [ "out" "dev" ];

GTEST_DIR = "${gtest}";
GTEST_DIR = "${gtest.src}/googletest";

propagatedBuildInputs = [ eigen epoxy ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL fftw gtest ];
buildInputs = [ SDL2 fftw gtest ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "High-performance, high-quality video filters for the GPU";