diff options
| author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-07-04 15:06:22 +1000 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2013-07-12 16:26:48 +0200 |
| commit | f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816 (patch) | |
| tree | b0f09588c2190c7b77a4b313b6618215febccb8f /pkgs/development/libraries/xvidcore | |
| parent | fbe2fe36e35f0b665cc919c6de897af966fec8bd (diff) | |
| download | nixpkgs-f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816.tar nixpkgs-f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816.tar.gz nixpkgs-f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816.tar.bz2 nixpkgs-f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816.tar.lz nixpkgs-f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816.tar.xz nixpkgs-f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816.tar.zst nixpkgs-f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816.zip | |
xvidcore: fix build on darwin
* remove unnecessary gcc flag * add --enable-macosx_module configure flag * add --disable-assembly configure flag * fix postInstall phase
Diffstat (limited to 'pkgs/development/libraries/xvidcore')
| -rw-r--r-- | pkgs/development/libraries/xvidcore/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 4ddbc5484ba..df7404e1faf 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm}: +{ stdenv, fetchurl, nasm, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "xvidcore-1.3.2"; @@ -8,9 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1x0b2rq6fv99ramifhkakycd0prjc93lbzrffbjgjwg7w4s17hfn"; }; - preConfigure = "cd build/generic"; + preConfigure = '' + cd build/generic + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-no-cpp-precomp" "" + ''; - buildInputs = [ nasm ]; + configureFlags = stdenv.lib.optionals stdenv.isDarwin + [ "--enable-macosx_module" "--disable-assembly" ]; buildInputs = [ nasm ] ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; @@ -27,10 +32,12 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with stdenv.lib; { description = "MPEG-4 video codec for PC"; - homepage = http://www.xvid.org/; - license = "GPLv2+"; + homepage = http://www.xvid.org/; + license = licenses.gplv2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; } |