summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2017-10-25 21:59:52 +0100
committerDomen Kožar <domen@enlambda.com>2017-10-30 12:25:33 +0100
commitb8a7c455f6e5eef0fe6d9d65701816cbf3662f57 (patch)
tree553c680751187a7487547df917b7cd5a04bcc9a3
parent5c35db3e9b1e365dc92414b1b926d8dfec684217 (diff)
downloadnixpkgs-b8a7c455f6e5eef0fe6d9d65701816cbf3662f57.tar
nixpkgs-b8a7c455f6e5eef0fe6d9d65701816cbf3662f57.tar.gz
nixpkgs-b8a7c455f6e5eef0fe6d9d65701816cbf3662f57.tar.bz2
nixpkgs-b8a7c455f6e5eef0fe6d9d65701816cbf3662f57.tar.lz
nixpkgs-b8a7c455f6e5eef0fe6d9d65701816cbf3662f57.tar.xz
nixpkgs-b8a7c455f6e5eef0fe6d9d65701816cbf3662f57.tar.zst
nixpkgs-b8a7c455f6e5eef0fe6d9d65701816cbf3662f57.zip
Fix idrisPackages.with-packages
1. The ln step was failing due to a file already existing
2. gcc was invoked directly which caused failure on OS X.
-rw-r--r--pkgs/development/idris-modules/with-packages.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index edcd20c1097..d2b09808ec1 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -10,7 +10,7 @@
 
     installIdrisLib () {
       if [ -d $1/lib/${idris.name} ]; then
-        ln -sv $1/lib/${idris.name}/* $out/lib/${idris.name}
+        ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name}
       fi
     }
 
@@ -34,7 +34,7 @@
   '';
 
   buildPhase = ''
-    gcc -O3 -o idris idris.c
+    $CC -O3 -o idris idris.c
   '';
 
   installPhase = ''