diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-17 23:22:17 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-17 23:24:42 +0100 |
commit | 1720abc263384992c10587dc51f8635bfa4e2391 (patch) | |
tree | e9b501e3dcc8a86df50c570d188643d740f95952 /pkgs/development/libraries/libaom/default.nix | |
parent | cee81d59ac8c9ca834c97bd20b7529440040b5c6 (diff) | |
download | nixpkgs-1720abc263384992c10587dc51f8635bfa4e2391.tar nixpkgs-1720abc263384992c10587dc51f8635bfa4e2391.tar.gz nixpkgs-1720abc263384992c10587dc51f8635bfa4e2391.tar.bz2 nixpkgs-1720abc263384992c10587dc51f8635bfa4e2391.tar.lz nixpkgs-1720abc263384992c10587dc51f8635bfa4e2391.tar.xz nixpkgs-1720abc263384992c10587dc51f8635bfa4e2391.tar.zst nixpkgs-1720abc263384992c10587dc51f8635bfa4e2391.zip |
libaom: use git stub instead of patching changelog
It probably needs less maintenance.
Diffstat (limited to 'pkgs/development/libraries/libaom/default.nix')
-rw-r--r-- | pkgs/development/libraries/libaom/default.nix | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 77d75a8c1d3..f6ff7e75895 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3Packages, writeText }: +{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3, writeText }: stdenv.mkDerivation rec { name = "libaom-${version}"; @@ -10,33 +10,22 @@ stdenv.mkDerivation rec { sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82"; }; - buildInputs = [ perl yasm ]; - nativeBuildInputs = [ cmake pkgconfig python3Packages.python ]; + nativeBuildInputs = [ + yasm perl cmake pkgconfig python3 + ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; - # * libaom tries to detect what version it is - # * I couldn't get it to grab this from git info, - # (which needs at least leaveDotGit=true) - # * it uses a perl script to parse from CHANGELOG, - # but 1.0.0 doesn't contain an entry for itself :( - # * Upstream patch that adds the entry also nukes all of - # the versions before a project change (open-sourcing?) - # and as a result is 34K which is way too big just to fix this! - # * A stable URL to fetch this from works, but... - # * Upon inspection the resulting CHANGELOG is shorter - # than this comment, so while yes this is a bit gross - # adding these 4 lines here does the job without - # a huge patch in spirit of preferring upstream's fix - # instead of `sed -i 's/v0\.1\.0/v1.0.0/g' aom.pc` or so. - postPatch = let actual_changelog = writeText "CHANGELOG" '' - 2018-06-28 v1.0.0 - AOMedia Codec Workgroup Approved version 1.0 - - 2016-04-07 v0.1.0 "AOMedia Codec 1" - This release is the first Alliance for Open Media codec. - ''; in '' - cp ${actual_changelog} CHANGELOG + preConfigure = '' + # build uses `git describe` to set the build version + cat > $NIX_BUILD_TOP/git << "EOF" + #!${stdenv.shell} + echo v${version} + EOF + chmod +x $NIX_BUILD_TOP/git + export PATH=$NIX_BUILD_TOP:$PATH ''; meta = with stdenv.lib; { |