From d3fedc6a9d0b9f93272c7ae0bdd4ecb483a6e747 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 3 Jul 2016 12:50:44 -0700 Subject: [PATCH] mono40: refactor to generic 40 --- pkgs/development/compilers/mono/4.0.nix | 6 ++++++ .../development/compilers/mono/{default.nix => generic.nix} | 4 +--- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/mono/4.0.nix rename pkgs/development/compilers/mono/{default.nix => generic.nix} (96%) diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix new file mode 100644 index 00000000000..8621751e5a1 --- /dev/null +++ b/pkgs/development/compilers/mono/4.0.nix @@ -0,0 +1,6 @@ +{ stdenv, callPackage, Foundation, libobjc }: +callPackage ./generic.nix (rec { + inherit Foundation libobjc; + version = "4.0.4.1"; + sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd"; +}) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/generic.nix similarity index 96% rename from pkgs/development/compilers/mono/default.nix rename to pkgs/development/compilers/mono/generic.nix index 123ffa57ac0..3bc962859e2 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,9 +1,7 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python }: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256 }: let llvm = callPackage ./llvm.nix { }; - sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd"; - version = "4.0.4.1"; in stdenv.mkDerivation rec { name = "mono-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd53a7de54c..e7a88757699 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4829,7 +4829,9 @@ in mlton = callPackage ../development/compilers/mlton { }; - mono = callPackage ../development/compilers/mono { + mono = mono40; + + mono40 = callPackage ../development/compilers/mono/4.0.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; };