diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/libvdpau | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvdpau')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libvdpau/default.nix | 17 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libvdpau/installdir.patch | 9 |
2 files changed, 17 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix index e6a57f1e38c4..977081e0ecf6 100644 --- a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa }: +{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }: stdenv.mkDerivation rec { pname = "libvdpau"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2"; - sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2"; + sha256 = "b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e"; }; + patches = [ ./installdir.patch ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = with xorg; [ xorgproto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; - configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${mesa.drivers.driverLink}/lib/vdpau"; + mesonFlags = stdenv.lib.optional stdenv.isLinux + [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; - installFlags = [ "moduledir=$(out)/lib/vdpau" ]; - meta = with stdenv.lib; { homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; diff --git a/nixpkgs/pkgs/development/libraries/libvdpau/installdir.patch b/nixpkgs/pkgs/development/libraries/libvdpau/installdir.patch new file mode 100644 index 000000000000..859715f70d39 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libvdpau/installdir.patch @@ -0,0 +1,9 @@ +--- a/trace/meson.build 2020-02-15 16:34:58.698832000 +0100 ++++ b/trace/meson.build 2020-02-15 16:39:05.359952802 +0100 +@@ -4,5 +4,5 @@ + dependencies : libdl, + version : '1.0.0', + install : true, +- install_dir : moduledir, ++ install_dir : get_option('prefix') + '/lib/libvdpau', + ) |