public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-17 09:39:23 +02:00
parent ed3cb39bfa c68f58d95c
commit fe9a3e3e63
174 changed files with 4833 additions and 1993 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/math/calc/default.nix
+1 -2
View File
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace Makefile \
--replace 'all: check_include' 'all:' \
--replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \
--replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
'';
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"T=$(out)"
"INCDIR=${lib.getDev stdenv.cc.libc}/include"
"INCDIR="
"BINDIR=/bin"
"LIBDIR=/lib"
"CALC_SHAREDIR=/share/calc"