diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/librevenge')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/librevenge/default.nix | 40 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/librevenge/default.upstream | 4 |
2 files changed, 17 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/development/libraries/librevenge/default.nix b/nixpkgs/pkgs/development/libraries/librevenge/default.nix index 1d7754bfcaef..627b7596c029 100644 --- a/nixpkgs/pkgs/development/libraries/librevenge/default.nix +++ b/nixpkgs/pkgs/development/libraries/librevenge/default.nix @@ -1,25 +1,20 @@ -{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib}: -let - s = # Generated upstream information - rec { - baseName="librevenge"; - version="0.0.4"; - name="${baseName}-${version}"; - hash="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; - url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz"; - sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk"; +{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib }: + +stdenv.mkDerivation rec { + pname = "librevenge"; + version = "0.0.4"; + + src = fetchurl { + url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${version}/librevenge-${version}.tar.xz"; + sha256 = "sha256-kz8HKfBCZ8w1S5oCvD6a/vpVEqO90LRfFZ7hSj4zR7I="; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - boost cppunit zlib + boost + cppunit + zlib ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; # Clang and gcc-7 generate warnings, and # -Werror causes these warnings to be interpreted as errors @@ -32,11 +27,10 @@ stdenv.mkDerivation { sed -i 's,-DLIBREVENGE_BUILD,\0 -DBOOST_ERROR_CODE_HEADER_ONLY,g' src/lib/Makefile.in ''; - meta = { - inherit (s) version; + meta = with lib; { description = "A base library for writing document import filters"; - license = lib.licenses.mpl20 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/librevenge/default.upstream b/nixpkgs/pkgs/development/libraries/librevenge/default.upstream deleted file mode 100644 index 78e47f83433f..000000000000 --- a/nixpkgs/pkgs/development/libraries/librevenge/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/libwpd/files/librevenge/ -SF_version_dir librevenge- -version_link '[.]tar.xz/download$' -SF_redirect |