Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

gst_all_1.gst-rtsp-server: fix pkgconfig includedir and libdir

authored by Doron Behar and committed by Jan Tojnar e30287c5 bf007a2c

+24
+9
pkgs/development/libraries/gstreamer/rtsp-server/default.nix
··· 20 20 21 21 outputs = [ "out" "dev" ]; 22 22 23 + patches = [ 24 + # To use split outputs, we need this so double prefix won't be used in the 25 + # pkg-config files. Hopefully, this won't be needed on the next release, 26 + # _if_ 27 + # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1 28 + # will be merged. For the current release, this merge request won't apply. 29 + ./fix_pkgconfig_includedir.patch 30 + ]; 31 + 23 32 nativeBuildInputs = [ 24 33 meson 25 34 ninja
+15
pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch
··· 1 + diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build 2 + index 8ed8299..594cbfe 100644 3 + --- i/pkgconfig/meson.build 4 + +++ w/pkgconfig/meson.build 5 + @@ -2,8 +2,8 @@ pkgconf = configuration_data() 6 + 7 + pkgconf.set('prefix', get_option('prefix')) 8 + pkgconf.set('exec_prefix', '${prefix}') 9 + -pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) 10 + -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) 11 + +pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) 12 + +pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) 13 + pkgconf.set('GST_API_VERSION', api_version) 14 + pkgconf.set('VERSION', gst_version) 15 +