Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 69ed29f5f411
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c5d5561f772f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 26, 2019

  1. root: wrap python executables 

    In normal use of ROOT the PYTHONPATH is intended to be set when user
sources the thisroot.{,s}sh. We do that in the setupHook. This covers
the case when thisroot.sh was not sourced.

(cherry picked from commit 0b28198)

cc #76541
    @veprbl
    veprbl committed Dec 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c5d5561 View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/applications/science/misc/root/default.nix
11 changes: 9 additions & 2 deletions pkgs/applications/science/misc/root/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
{ stdenv, fetchurl, makeWrapper, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash
, Cocoa, OpenGL, noSplash ? false }:

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
@@ -65,6 +65,13 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

postInstall = ''
for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do
wrapProgram "$out/bin/$prog" \
--prefix PYTHONPATH : "$out/lib"
done
'';

setupHook = ./setup-hook.sh;

meta = with stdenv.lib; {