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: 0e21aef5938e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a3761b66327
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 13, 2020

  1. archi: unbreak build 

    Additionally make a wrapper to put the jdk in the PATH to avoid
needed a global JDK
    @freezeboy
    freezeboy committed Dec 13, 2020
    Copy the full SHA
    b25ba4a View commit details

Commits on Jan 20, 2021

  1. Merge pull request #106814 from freezeboy/unbreak-archi 

    archi: unbreak build
    @SuperSandro2000
    SuperSandro2000 authored Jan 20, 2021
    Copy the full SHA
    9a3761b View commit details
Showing with 9 additions and 4 deletions.
  1. +9 −4 pkgs/tools/misc/archi/default.nix
13 changes: 9 additions & 4 deletions pkgs/tools/misc/archi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@
, fetchurl
, fetchzip
, autoPatchelfHook
, makeWrapper
, jdk
, libsecret
}:

@@ -29,17 +31,20 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
autoPatchelfHook
makeWrapper
];

installPhase =
if stdenv.hostPlatform.system == "x86_64-linux" then
''
mkdir -p $out/bin
for f in configuration features p2 plugins Archi.ini Archi; do
cp $f $out/bin/
mkdir -p $out/bin $out/libexec
for f in configuration features p2 plugins Archi.ini; do
cp -r $f $out/libexec
done
install -D -m755 Archi $out/bin/Archi
install -D -m755 Archi $out/libexec/Archi
makeWrapper $out/libexec/Archi $out/bin/Archi \
--prefix PATH : ${jdk}/bin
''
else
''