Fix Conda

selkies-project · Aug 12, 2024 · 8bccfed · 8bccfed
1 parent 8bab0e5
commit 8bccfed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/addons/conda/build/build.sh b/addons/conda/build/build.sh
@@ -8,8 +8,8 @@ set -e -x
 mkdir -pm755 build
 pushd build
 
-export XDG_DATA_DIRS="${XDG_DATA_DIRS+${XDG_DATA_DIRS}:}${PREFIX}/share:${BUILD_PREFIX}/share"
-export PKG_CONFIG_PATH="${PKG_CONFIG_PATH+${PKG_CONFIG_PATH}:}${PREFIX}/lib/pkgconfig:${BUILD_PREFIX}/lib/pkgconfig"
+export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${PREFIX}/share:${BUILD_PREFIX}/share"
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${PREFIX}/lib/pkgconfig:${BUILD_PREFIX}/lib/pkgconfig"
 export PKG_CONFIG="${BUILD_PREFIX}/bin/pkgconfig"
 
 # Build and install GStreamer

diff --git a/addons/conda/build/meta.yaml b/addons/conda/build/meta.yaml
@@ -45,9 +45,6 @@ requirements:
     - cross-python_{{ target_platform }} {{ python }}  # [build_platform != target_platform]
     - cargo-c
     - pkg-config
-    - autoconf
-    - automake
-    - bash-completion
     - binutils
     - {{ posix }}bison
     - file
@@ -58,10 +55,10 @@ requirements:
     - git
     - git-lfs
     - gmp
-    - glib
     - gobject-introspection
     - gsl
     - libcap
+    - libiconv
     - libtool
     - libgcrypt
     - nasm