From 5be38cc1e4d29274a58c40e60dded1828eeadd17 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 21 Dec 2021 12:41:33 +0100
Subject: [PATCH] libmwaw: refactor
---
.../development/libraries/libmwaw/default.nix | 43 +++++++++----------
.../libraries/libmwaw/default.upstream | 4 --
2 files changed, 20 insertions(+), 27 deletions(-)
delete mode 100644 pkgs/development/libraries/libmwaw/default.upstream
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 37093b28c581..8f83c2055c62 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -1,32 +1,29 @@
-{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
-let
- s = # Generated upstream information
- rec {
- baseName="libmwaw";
- version="0.3.21";
- name="${baseName}-${version}";
- hash="sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
- url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.21/libmwaw-0.3.21.tar.xz";
- sha256="sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
+{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge }:
+
+stdenv.mkDerivation rec {
+ pname = "libmwaw";
+ version = "0.3.21";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.xz";
+ sha256 = "sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
};
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;
- };
enableParallelBuilding = true;
- meta = {
- inherit (s) version;
+
+ meta = with lib; {
description = "Import library for some old mac text 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/libmwaw/default.upstream b/pkgs/development/libraries/libmwaw/default.upstream
deleted file mode 100644
index bcfb53770e1e..000000000000
--- a/pkgs/development/libraries/libmwaw/default.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-url https://sourceforge.net/projects/libmwaw/files/libmwaw/
-SF_version_dir libmwaw-
-version_link '[.]tar.xz/download$'
-SF_redirect