nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

gst_all_1.gst-rtsp-server: 1.18.5 → 1.20.0

Browse Source
This commit is contained in:
Jan Tojnar 2022-02-06 18:36:01 +01:00
parent 500a98c8cc
commit 0baf106ccd
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/gstreamer/rtsp-server/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ stdenv
, lib
, fetchurl
, meson
, ninja
@ -12,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
version = "1.18.5";
version = "1.20.0";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-BNY79IgWxvQcc/beD5EqfO8KqznEQWKnvOzhkj38nR8=";
sha256 = "sha256-wgn17ZBtpxP91EqIROkJqmyK89+2MCWbCSz7d6d1WEM=";
};
outputs = [
@ -25,15 +26,6 @@ stdenv.mkDerivation rec {
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
];
patches = [
# To use split outputs, we need this so double prefix won't be used in the
# pkg-config files. Hopefully, this won't be needed on the next release,
# _if_
# https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1
# will be merged. For the current release, this merge request won't apply.
./fix_pkgconfig_includedir.patch
];
nativeBuildInputs = [
meson
ninja

15
pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch
View File

@ -1,15 +0,0 @@
diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build
index 8ed8299..594cbfe 100644
--- i/pkgconfig/meson.build
+++ w/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
pkgconf.set('prefix', get_option('prefix'))
pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', api_version)
pkgconf.set('VERSION', gst_version)