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

Merge pull request #74092 from veprbl/pr/applgrid_fix

Browse Source 
applgrid: fix build
This commit is contained in:
Matthew Bauer 2019-11-25 22:22:48 -06:00 committed by GitHub
commit e010c1b031
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/misc/root/setup-hook.sh
View File

@ -1,9 +1,13 @@
thisroot () { thisroot () {
# Workaround thisroot.sh dependency on man # Workaround thisroot.sh dependency on man
if [ -z "${MANPATH}" ]; then if [ -z "${MANPATH-}" ]; then
MANPATH=: MANPATH=:
fi fi
local oldOpts="-u"
shopt -qo nounset || oldOpts="+u"
set +u
source @out@/bin/thisroot.sh source @out@/bin/thisroot.sh
set "$oldOpts"
} }
postHooks+=(thisroot) postHooks+=(thisroot)

5
pkgs/development/libraries/physics/applgrid/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }: { stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "applgrid"; pname = "applgrid";
@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
}; };
buildInputs = [ gfortran hoppet lhapdf root5 ]; # For some reason zlib was only needed after bump to gfortran8
buildInputs = [ gfortran hoppet lhapdf root5 zlib ];
patches = [ patches = [
./bad_code.patch ./bad_code.patch