From ad87dc75d6cef7a82fef5153d6bc8141e916c5a1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Mar 2024 00:23:38 +0100 Subject: [PATCH] opencflite: 476.19.0 -> 635.21.8 --- pkgs/by-name/op/opencflite/package.nix | 43 +++++++++++++++++++ .../os-specific/darwin/opencflite/default.nix | 21 --------- pkgs/top-level/darwin-packages.nix | 2 - 3 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 pkgs/by-name/op/opencflite/package.nix delete mode 100644 pkgs/os-specific/darwin/opencflite/default.nix diff --git a/pkgs/by-name/op/opencflite/package.nix b/pkgs/by-name/op/opencflite/package.nix new file mode 100644 index 000000000000..0da9e52e81d6 --- /dev/null +++ b/pkgs/by-name/op/opencflite/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + icu, + libkqueue, + libuuid, + tzdata, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "opencflite"; + version = "635.21.8"; + + src = fetchFromGitHub { + owner = "gerickson"; + repo = "opencflite"; + rev = "opencflite-${version}"; + hash = "sha256-ijyj4SFYQ0wZAFM2ehNnR9+yu5yDTSVW3VBycBT9l+A="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + icu + libkqueue + libuuid + tzdata + zlib + ]; + + enableParallelBuilding = true; + + meta = { + description = "Cross platform port of the macOS CoreFoundation"; + homepage = "https://github.com/gerickson/opencflite"; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ wegank ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix deleted file mode 100644 index 937d0763feff..000000000000 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, icu, libuuid, tzdata }: - -stdenv.mkDerivation rec { - pname = "opencflite"; - version = "476.19.0"; - - src = fetchurl { - url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz"; - sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; - }; - - configureFlags = [ "--with-uuid=${libuuid.dev}" ]; - buildInputs = [ icu tzdata.dev ]; - enableParallelBuilding = true; - - meta = { - description = "Cross platform port of the macOS CoreFoundation"; - homepage = "https://sourceforge.net/projects/opencflite/"; - license = lib.licenses.apsl20; - }; -} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 8fb08c90f70f..1b479e9294bc 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -175,8 +175,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { inherit (apple_sdk_11_0.libs) simd; }; - opencflite = callPackage ../os-specific/darwin/opencflite { }; - openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith { inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers; };