From 2197c952225aee6bead5bf53d0d7c08656998121 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 01:30:58 +0000 Subject: [PATCH 1/2] owl-lisp: 0.1.23 -> 0.2 --- pkgs/development/compilers/owl-lisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index 1d8ba03e72f..6e31a1632b9 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.1.23"; + version = "0.2"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i"; + sha256 = "sha256-G12yZxlq6Hss5j4Seq1hcPQWXMIeL2Z8VkBdmIGESX8="; }; nativeBuildInputs = [ which ]; From cc551b204ababb1455ddec1369a7bd6af011300e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Feb 2021 20:31:00 -0500 Subject: [PATCH 2/2] owl-lisp: enable on darwin --- pkgs/development/compilers/owl-lisp/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index 6e31a1632b9..d8d141a5e56 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, coreutils, which }: +{ lib, stdenv, fetchFromGitLab, which }: stdenv.mkDerivation rec { pname = "owl-lisp"; @@ -13,10 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; - prePatch = '' - substituteInPlace Makefile \ - --replace /usr $out - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; # tests are run as part of the compilation process doCheck = false; @@ -26,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/owl-lisp/owl"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }