diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-09-03 11:52:46 +0300 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-09-03 13:04:55 +0200 |
| commit | e30287c590de2d65595c47e142af08d8030ca240 (patch) | |
| tree | 71f515d0be4b8ef70c2183d996cc251bd81abcfa | |
| parent | bf007a2c0a8c60c4c552c3213b4f095de928ee23 (diff) | |
gst_all_1.gst-rtsp-server: fix pkgconfig includedir and libdir
| -rw-r--r-- | pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch | 15 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index dfb18754c839..92e8a45a4f6f 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + 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 diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..d31fe19fb0fe --- /dev/null +++ b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch @@ -0,0 +1,15 @@ +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) + |