Merge staging-next into staging

2019-04-30 15:52:19 +02:00
parent 84a15876a3 2e7c7dad92
commit 3462fe27d9
237 changed files with 8482 additions and 2711 deletions
@@ -1,20 +1,17 @@
 { stdenv, lib, fetchFromGitHub, cmake }:

-let
-  version = "1.8.1";
-in
-
 stdenv.mkDerivation rec {
-  name = "libobjc2-${version}";
+  pname = "libobjc2";
+  version = "1.9";

  src = fetchFromGitHub {
    owner = "gnustep";
    repo = "libobjc2";
    rev = "v${version}";
-    sha256 = "12v9pjg97h56mb114cqd22q1pdwhmxrgdw5hal74ddlrhiq1nzvi";
+    sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn";
  };

-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];

  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];