diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-01-17 13:07:46 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-06-17 07:26:01 +0200 |
commit | 84de36a0c8c24eee747f9deaf9687c7b840a4a13 (patch) | |
tree | 59e13aae375db867ee4c73e7f6cb607debfe2654 | |
parent | 1096720c5f8e7abf2a4ad1ed1b402ab25e8309e2 (diff) |
darling-dmg: 1.0.4 -> 1.0.4+git20180914
-rw-r--r-- | pkgs/tools/filesystems/darling-dmg/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 4952036a860b6..93bd46b146644 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,24 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : +{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : stdenv.mkDerivation rec { name = "darling-dmg-${version}"; - version = "1.0.4"; + version = "1.0.4+git20180914"; src = fetchFromGitHub { owner = "darlinghq"; repo = "darling-dmg"; - rev = "v${version}"; - sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk"; + rev = "97a92a6930e43cdbc9dedaee62716e3223deb027"; + sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj"; }; - patches = [ - (fetchpatch { - url = "https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch"; - sha256 = "05fhgn5c09f1rva6bvbq16nhlkblrhscbf69k04ajwdh7y98sw39"; - }) - ]; - - buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ]; # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; |