Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40fd4903c2cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1944dc7e706e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 9, 2018

  1. xalanc: /usr -> / 

    (cherry picked from commit 2e0dfb4)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Apr 9, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1944dc7 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/development/libraries/xalanc/default.nix
5 changes: 2 additions & 3 deletions pkgs/development/libraries/xalanc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,12 +13,11 @@ in stdenv.mkDerivation rec {
sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
};

# TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below
configurePhase = ''
export XALANCROOT=`pwd`/c
cd `pwd`/c
mkdir -p $out/usr
./runConfigure -p ${platform} -c cc -x c++ -P$out/usr
mkdir -p $out
./runConfigure -p ${platform} -c cc -x c++ -P$out
'';

buildInputs = [ xercesc getopt ];