diff options
author | Felix Buehler <account@buehler.rocks> | 2021-12-21 12:54:40 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2021-12-21 12:54:40 +0100 |
commit | 88839577277e05905852a14585d12eaa9687c6a1 (patch) | |
tree | 7087c20f9f944b583120e89f8ba9c6e4dbd64213 /pkgs/development/libraries/libodfgen | |
parent | 459f9fe2bea3546a95002dcfe2aa55b1e4d6bef9 (diff) | |
download | nixpkgs-88839577277e05905852a14585d12eaa9687c6a1.tar nixpkgs-88839577277e05905852a14585d12eaa9687c6a1.tar.gz nixpkgs-88839577277e05905852a14585d12eaa9687c6a1.tar.bz2 nixpkgs-88839577277e05905852a14585d12eaa9687c6a1.tar.lz nixpkgs-88839577277e05905852a14585d12eaa9687c6a1.tar.xz nixpkgs-88839577277e05905852a14585d12eaa9687c6a1.tar.zst nixpkgs-88839577277e05905852a14585d12eaa9687c6a1.zip |
libodfgen: refactor
Diffstat (limited to 'pkgs/development/libraries/libodfgen')
-rw-r--r-- | pkgs/development/libraries/libodfgen/default.nix | 44 | ||||
-rw-r--r-- | pkgs/development/libraries/libodfgen/default.upstream | 4 |
2 files changed, 21 insertions, 27 deletions
diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index b891c320e86..d4a6aab24c8 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -1,30 +1,28 @@ -{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}: -let - s = # Generated upstream information - rec { - baseName="libodfgen"; - version="0.1.7"; - name="${baseName}-${version}"; - hash="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij"; - url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz"; - sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij"; +{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge }: + +stdenv.mkDerivation rec { + pname = "libodfgen"; + version = "0.1.7"; + + src = fetchurl { + url = "mirror://sourceforge/project/libwpd/libodfgen/libodfgen-${version}/libodfgen-${version}.tar.xz"; + sha256 = "sha256-Mj5JH5VsjKKrsSyZjjUGcJMKMjF7+WYrBhXdSzkiuDE="; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - boost cppunit zlib libwpg libwpd librevenge + boost + cppunit + zlib + libwpg + libwpd + librevenge ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - meta = { - inherit (s) version; + + meta = with lib; { description = "A base library for generating ODF documents"; - 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/pkgs/development/libraries/libodfgen/default.upstream b/pkgs/development/libraries/libodfgen/default.upstream deleted file mode 100644 index bd78e974e42..00000000000 --- a/pkgs/development/libraries/libodfgen/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/libwpd/files/libodfgen/ -SF_version_dir libodfgen- -version_link '[.]tar.xz/download$' -SF_redirect |