From 39f544817a7c9f3c05fd9d4cc53d436dde005829 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 6 Oct 2020 14:44:25 +0700 Subject: [PATCH] ois: 1.3 -> 1.5 --- pkgs/development/libraries/ois/default.nix | 37 ++++++---------------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index f750e4a685bb..ee85e64966f6 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -1,41 +1,24 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xorgproto -, libXi, libXaw, libXmu, libXt }: - -let - majorVersion = "1"; - minorVersion = "3"; -in +{ stdenv, lib, fetchFromGitHub, cmake, libX11, Cocoa, IOKit, Kernel }: stdenv.mkDerivation rec { pname = "ois"; - version = "${majorVersion}.${minorVersion}"; + version = "1.5"; - src = fetchurl { - url = "mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz"; - sha256 = "18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh"; + src = fetchFromGitHub { + owner = "wgois"; + repo = "OIS"; + rev = "v${version}"; + sha256 = "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa"; }; - patches = [ - (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch"; - sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8"; - name = "gcc47.patch"; - }) - ]; + nativeBuildInputs = [ cmake ]; - patchFlags = [ "-p0" ]; - - buildInputs = [ - autoconf automake libtool libX11 xorgproto libXi libXaw - libXmu libXt - ]; - - preConfigure = "sh bootstrap"; + buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; meta = with stdenv.lib; { description = "Object-oriented C++ input system"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 567d4d08d21b..59b8722ddad1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14706,7 +14706,9 @@ in opendmarc = callPackage ../development/libraries/opendmarc { }; - ois = callPackage ../development/libraries/ois {}; + ois = callPackage ../development/libraries/ois { + inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel; + }; openh264 = callPackage ../development/libraries/openh264 { };