From 27bb66bd94e97d40f4169a6fd2fc4dbc68b26eb6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 23 Aug 2016 03:32:55 +0300 Subject: [PATCH] treewide: Make explicit that 'dev' output of gst_all_1.gst-plugins-base is used --- pkgs/desktops/enlightenment/efl.nix | 2 +- pkgs/misc/emulators/retrofe/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index fc584b432f1..218de3bfa7c 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { patches = [ ./efl-elua.patch ]; preConfigure = '' - export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" ''; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 3a537aafa76..5f921c5a923 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configurePhase = '' cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \ -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \ - -DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base}/include/gstreamer-1.0' + -DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0' ''; buildPhase = ''