Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fa1cf8098aff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e506ce50501b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 4, 2019

  1. python.pkgs.pymediainfo: fix build 

    (cherry picked from commit 4c0f0a0)
    Robert Schütz committed Mar 4, 2019
    Copy the full SHA
    e506ce5 View commit details
Showing with 6 additions and 13 deletions.
  1. +6 −13 pkgs/development/python-modules/pymediainfo/default.nix
19 changes: 6 additions & 13 deletions pkgs/development/python-modules/pymediainfo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,19 +14,12 @@ buildPythonPackage rec {

postPatch = ''
substituteInPlace pymediainfo/__init__.py \
--replace 'CDLL(library_file)' \
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
--replace 'CDLL("libmediainfo.0.dylib")' \
'CDLL("${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}")' \
--replace 'CDLL("libmediainfo.dylib")' \
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
--replace 'CDLL("libmediainfo.so.0")' \
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0")'
# Fix test, remove after version 2.3.0
substituteInPlace tests/test_pymediainfo.py \
--replace 'codec, "AVC"' 'format, "AVC"' \
--replace 'codec, "AAC LC"' 'format, "AAC"'
--replace "libmediainfo.0.dylib" \
"${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}" \
--replace "libmediainfo.dylib" \
"${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}" \
--replace "libmediainfo.so.0" \
"${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0"
'';

nativeBuildInputs = [ setuptools_scm ];