summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2020-11-27 00:37:01 +0100
committerGitHub <noreply@github.com>2020-11-27 00:37:01 +0100
commite3382c54aeccfc8cbebecf194981e69cf47ef653 (patch)
tree04b69caf0f00b7c41d53f4d59d80376f1da247cc /pkgs/tools/filesystems
parent1180d547dafb294633d2cec3df1cf2c9b99eb0b4 (diff)
parent7087cf925f9fbc8563f03a5a3a5c0a36831ac118 (diff)
downloadnixpkgs-e3382c54aeccfc8cbebecf194981e69cf47ef653.tar
nixpkgs-e3382c54aeccfc8cbebecf194981e69cf47ef653.tar.gz
nixpkgs-e3382c54aeccfc8cbebecf194981e69cf47ef653.tar.bz2
nixpkgs-e3382c54aeccfc8cbebecf194981e69cf47ef653.tar.lz
nixpkgs-e3382c54aeccfc8cbebecf194981e69cf47ef653.tar.xz
nixpkgs-e3382c54aeccfc8cbebecf194981e69cf47ef653.tar.zst
nixpkgs-e3382c54aeccfc8cbebecf194981e69cf47ef653.zip
Merge pull request #101637 from Luflosi/update/darling-dmg
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/darling-dmg/default.nix23
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 43823e5b51a..42853eb8ff9 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }:
 
 stdenv.mkDerivation rec {
   pname = "darling-dmg";
-  version = "1.0.4+git20180914";
+  version = "1.0.4+git20200427";
 
   src = fetchFromGitHub {
     owner = "darlinghq";
     repo = "darling-dmg";
-    rev = "97a92a6930e43cdbc9dedaee62716e3223deb027";
-    sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj";
+    rev = "71cc76c792db30328663272788c0b64aca27fdb0";
+    sha256 = "08iphkxlmjddrxpbm13gxyqwcrd0k65z3l1944n4pccb6qbyj8gv";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ];
+  buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ];
 
-  # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
-  CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
+  CXXFLAGS = [
+    "-DCOMPILE_WITH_LZFSE=1"
+    "-llzfse"
+  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://www.darlinghq.org/";
     description = "Darling lets you open macOS dmgs on Linux";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl3;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ Luflosi ];
   };
 }