From 0ecfae7c0f3800e03756aadea5fda043e4cab3fa Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Apr 2019 16:28:48 -0500 Subject: [PATCH 1/2] gnustep.libobjc: 1.8.1 -> 1.9 https://github.com/gnustep/libobjc2/releases/tag/v1.9 --- pkgs/desktops/gnustep/libobjc2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index 3aba235b3a7..cb4a609a4c1 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake }: let - version = "1.8.1"; + version = "1.9"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "gnustep"; repo = "libobjc2"; rev = "v${version}"; - sha256 = "12v9pjg97h56mb114cqd22q1pdwhmxrgdw5hal74ddlrhiq1nzvi"; + sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn"; }; buildInputs = [ cmake ]; From 74273c47ef644de459fd969a039c9d39ed14f668 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Apr 2019 17:44:21 -0500 Subject: [PATCH 2/2] libobjc2: pname, cmake as nativeBuildInput --- pkgs/desktops/gnustep/libobjc2/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index cb4a609a4c1..b238623eb09 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -1,11 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake }: -let - version = "1.9"; -in - stdenv.mkDerivation rec { - name = "libobjc2-${version}"; + pname = "libobjc2"; + version = "1.9"; src = fetchFromGitHub { owner = "gnustep"; @@ -14,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00pscl3ly3rv6alf9vk70kxnnxq2rfgpc1ylcv6cgjs9jxdnrqmn"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];