From 5284c5684fcf14dd122840e59c79661ff835fed9 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Wed, 25 Mar 2015 22:12:16 -0400 Subject: [PATCH 1/2] orc: Enable building on Darwin --- pkgs/development/compilers/orc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index e6a418c18956..1c1b5d53cee9 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } From c7a0e68e5896bf7db8793ffe5ca27d2338e9a084 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 28 Feb 2015 10:14:43 -0500 Subject: [PATCH 2/2] schroedinger: 1.0.0 -> 1.0.11 --- .../libraries/schroedinger/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 67f026fb4828..c80b1bca685f 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,11 +1,28 @@ -{stdenv, fetchurl, liboil, pkgconfig}: +{stdenv, fetchurl, orc, pkgconfig}: stdenv.mkDerivation { - name = "schroedinger-1.0.0"; + name = "schroedinger-1.0.11"; + src = fetchurl { - url = mirror://sourceforge/schrodinger/schroedinger-1.0.0.tar.gz; - sha256 = "0r374wvc73pfzkcpwk0q0sjx6yhp79acyiqbjy3c7sfqdy7sm4x8"; + url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz; + sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - buildInputs = [liboil pkgconfig]; + buildInputs = [orc pkgconfig]; + + # The test suite is known not to build against Orc >0.4.16 in Schroedinger 1.0.11. + # A fix is in upstream, so test when pulling 1.0.12 if this is still needed. See: + # http://www.mail-archive.com/schrodinger-devel@lists.sourceforge.net/msg00415.html + preBuild = '' + substituteInPlace Makefile \ + --replace "SUBDIRS = schroedinger doc tools testsuite" "SUBDIRS = schroedinger doc tools" \ + --replace "DIST_SUBDIRS = schroedinger doc tools testsuite" "DIST_SUBDIRS = schroedinger doc tools" + ''; + + meta = with stdenv.lib; { + homepage = "http://diracvideo.org/"; + maintainers = [ maintainers.spwhitt ]; + license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; + platforms = platforms.unix; + }; }