Merge pull request #163924 from OPNA2608/fix/autoPatchelfHook_isLinux

main
Ben Siraphob 2 years ago committed by GitHub
commit ed863440b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      pkgs/applications/audio/hqplayer-desktop/default.nix
  2. 2
      pkgs/applications/audio/losslessaudiochecker/default.nix
  3. 1
      pkgs/applications/audio/soundwireserver/default.nix
  4. 2
      pkgs/applications/editors/pinegrow/default.nix
  5. 1
      pkgs/applications/graphics/pixeluvo/default.nix
  6. 1
      pkgs/applications/misc/foxitreader/default.nix
  7. 1
      pkgs/applications/misc/upwork/default.nix
  8. 7
      pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
  9. 2
      pkgs/applications/networking/mailreaders/mailspring/default.nix
  10. 2
      pkgs/applications/networking/tetrd/default.nix
  11. 2
      pkgs/applications/terminal-emulators/syncterm/default.nix
  12. 10
      pkgs/build-support/trivial-builders.nix
  13. 5
      pkgs/development/compilers/dmd/binary.nix
  14. 3
      pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
  15. 2
      pkgs/development/compilers/inklecate/default.nix
  16. 5
      pkgs/development/compilers/ldc/binary.nix
  17. 12
      pkgs/development/compilers/zulu/8.nix
  18. 8
      pkgs/development/compilers/zulu/default.nix
  19. 17
      pkgs/development/libraries/cutelyst/default.nix
  20. 4
      pkgs/development/libraries/libargon2/default.nix
  21. 2
      pkgs/development/libraries/openvino/default.nix
  22. 3
      pkgs/development/libraries/talloc/default.nix
  23. 2
      pkgs/development/lua-modules/overrides.nix
  24. 3
      pkgs/development/misc/msp430/mspds/binary.nix
  25. 4
      pkgs/development/mobile/androidenv/build-tools.nix
  26. 3
      pkgs/development/mobile/androidenv/platform-tools.nix
  27. 2
      pkgs/development/python-modules/wxPython/4.1.nix
  28. 1
      pkgs/development/tools/analysis/codeql/default.nix
  29. 3
      pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix
  30. 3
      pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
  31. 3
      pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
  32. 3
      pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
  33. 3
      pkgs/development/tools/build-managers/bloop/default.nix
  34. 7
      pkgs/development/tools/build-managers/scala-cli/default.nix
  35. 2
      pkgs/development/tools/ccloud-cli/default.nix
  36. 2
      pkgs/development/tools/confluent-cli/default.nix
  37. 4
      pkgs/development/tools/mold/default.nix
  38. 1
      pkgs/servers/hqplayerd/default.nix
  39. 3
      pkgs/servers/ombi/default.nix
  40. 5
      pkgs/servers/search/elasticsearch/6.x.nix
  41. 3
      pkgs/servers/search/elasticsearch/7.x.nix
  42. 7
      pkgs/servers/web-apps/virtlyst/default.nix
  43. 3
      pkgs/shells/powershell/default.nix
  44. 3
      pkgs/tools/archivers/rar/default.nix
  45. 4
      pkgs/tools/games/ajour/default.nix
  46. 3
      pkgs/tools/misc/archi/default.nix
  47. 3
      pkgs/top-level/all-packages.nix

@ -86,6 +86,7 @@ mkDerivation rec {
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software HD-audio player";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lovesegfault ];
};
}

@ -23,7 +23,7 @@ stdenv.mkDerivation {
description = "Utility to check whether audio is truly lossless or not";
homepage = "https://losslessaudiochecker.com";
license = lib.licenses.unfree;
platforms = lib.platforms.x86_64;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ p-h ];
};
}

@ -34,6 +34,7 @@ qt5.mkDerivation {
description = "Turn your Android device into wireless headphones / wireless speaker";
homepage = "https://georgielabs.net/";
maintainers = with maintainers; [ mkg20001 ];
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
};
}

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://pinegrow.com";
description = "UI Web Editor";
platforms = platforms.linux;
platforms = [ "x86_64-linux" ];
license = with licenses; [ unfreeRedistributable ];
maintainers = with maintainers; [ gador ];
};

@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
description = "A Beautifully Designed Image and Photo Editor for Windows and Linux";
homepage = "http://www.pixeluvo.com/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ wolfangaukang ];
};
}

@ -74,6 +74,7 @@ mkDerivation rec {
description = "A viewer for PDF documents";
homepage = "https://www.foxitsoftware.com/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ p-h rhoriguchi ];
};
}

@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
description = "Online freelancing platform desktop application for time tracking";
homepage = "https://www.upwork.com/ab/downloads/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zakkor wolfangaukang ];
};
}

@ -17,7 +17,12 @@ stdenv.mkDerivation rec {
src = fetchurl source;
nativeBuildInputs = [ autoPatchelfHook ] ++ (if stdenv.isDarwin then [ unzip ] else [ dpkg ]);
nativeBuildInputs = lib.optionals stdenv.isLinux [
autoPatchelfHook
dpkg
] ++ lib.optionals stdenv.isDarwin [
unzip
];
unpackPhase = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src .";

@ -90,6 +90,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ toschmidt doronbehar ];
homepage = "https://getmailspring.com";
downloadPage = "https://github.com/Foundry376/Mailspring";
platforms = platforms.x86_64;
platforms = [ "x86_64-linux" ];
};
}

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
description = "Share your internet connection from your device to your PC and vice versa through a USB cable";
homepage = "https://tetrd.app";
license = licenses.unfree;
platforms = platforms.all;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ Madouura ];
};
}

@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
homepage = "https://syncterm.bbsdev.net/";
description = "BBS terminal emulator";
maintainers = with maintainers; [ embr ];
platforms = platforms.unix;
license = licenses.gpl2Plus;
broken = stdenv.isDarwin; # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin'
};
}

@ -516,15 +516,19 @@ rec {
* # setup hook that depends on the hello package and runs ./myscript.sh
* myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh;
*
* # wrotes a setup hook where @bash@ myscript.sh is substituted for the
* # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the
* # bash interpreter.
* myhellohookSub = makeSetupHook {
* deps = [ hello ];
* substitutions = { bash = "${pkgs.bash}/bin/bash"; };
* meta.platforms = lib.platforms.linux;
* } ./myscript.sh;
*/
makeSetupHook = { name ? "hook", deps ? [], substitutions ? {} }: script:
runCommand name substitutions
makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {} }: script:
runCommand name
(substitutions // {
inherit meta;
})
(''
mkdir -p $out/nix-support
cp ${script} $out/nix-support/setup-hook

@ -18,8 +18,9 @@ in stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ autoPatchelfHook ]
++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs = lib.optionals hostPlatform.isLinux [
autoPatchelfHook
] ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc;
installPhase = ''

@ -86,7 +86,8 @@ let
zlib
];
nativeBuildInputs = [ unzip perl autoPatchelfHook makeWrapper ];
nativeBuildInputs = [ unzip perl makeWrapper ]
++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
unpackPhase = ''
unpack_jar() {

@ -17,7 +17,7 @@ buildDotnetModule rec {
sha256 = "00lagmwsbxap5mgnw4gndpavmv3xsgincdaq1zvw7fkc3vn3pxqc";
};
nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
buildInputs = [ stdenv.cc.cc.lib ];
projectFile = "inklecate/inklecate.csproj";

@ -18,8 +18,9 @@ in stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ autoPatchelfHook ]
++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs = lib.optionals hostPlatform.isLinux [
autoPatchelfHook
] ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ];

@ -61,18 +61,22 @@ in stdenv.mkDerivation {
];
nativeBuildInputs = [
autoPatchelfHook makeWrapper
makeWrapper
] ++ lib.optionals stdenv.isLinux [
autoPatchelfHook
] ++ lib.optionals stdenv.isDarwin [
unzip
];
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r ./* "$out/"
'' + lib.optionalString stdenv.isLinux ''
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/
'' + ''
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
@ -87,6 +91,8 @@ in stdenv.mkDerivation {
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
fi
done
'' + ''
runHook postInstall
'';
preFixup = ''

@ -63,12 +63,16 @@ in stdenv.mkDerivation {
];
nativeBuildInputs = [
autoPatchelfHook makeWrapper
makeWrapper
] ++ lib.optionals stdenv.isLinux [
autoPatchelfHook
] ++ lib.optionals stdenv.isDarwin [
unzip
];
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r ./* "$out/"
'' + lib.optionalString stdenv.isLinux ''
@ -90,6 +94,8 @@ in stdenv.mkDerivation {
for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
done
'' + ''
runHook postInstall
'';
preFixup = ''

@ -14,20 +14,28 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ];
buildInputs = [
qtbase
grantlee
] ++ lib.optionals stdenv.isLinux [
libuuid
libcap
uwsgi
pcre
];
cmakeFlags = [
"-DPLUGIN_UWSGI=ON"
"-DPLUGIN_UWSGI=${if stdenv.isLinux then "ON" else "OFF"}" # Missing uwsgi symbols on Darwin
"-DPLUGIN_STATICCOMPRESSED=ON"
"-DPLUGIN_CSRFPROTECTION=ON"
"-DPLUGIN_VIEW_GRANTLEE=ON"
];
preBuild = ''
preBuild = lib.optionalString stdenv.isLinux ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/Cutelyst:`pwd`/EventLoopEPoll"
'';
postBuild = ''
postBuild = lib.optionalString stdenv.isLinux ''
unset LD_LIBRARY_PATH
'';
@ -35,6 +43,7 @@ stdenv.mkDerivation rec {
description = "C++ Web Framework built on top of Qt";
homepage = "https://cutelyst.org/";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
};
}

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i";
};
nativeBuildInputs = [ fixDarwinDylibNames ];
nativeBuildInputs = lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
];
patches = [
# TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released

@ -129,6 +129,8 @@ stdenv.mkDerivation rec {
'';
homepage = "https://docs.openvinotoolkit.org/";
license = with licenses; [ asl20 ];
platforms = platforms.all;
broken = stdenv.isDarwin; # Cannot find macos sdk
maintainers = with maintainers; [ tfmoraes ];
};
}

@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
fixDarwinDylibNames
python3
wafHook
docbook-xsl-nons
docbook_xml_dtd_42
] ++ lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
];
buildInputs = [

@ -301,7 +301,7 @@ with prev;
sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
'';
nativeBuildInputs = [ pkgs.fixDarwinDylibNames ];
nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ];
# Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin

@ -17,7 +17,8 @@ in stdenv.mkDerivation rec {
if stdenv.hostPlatform.isWindows then "MSP430${archPostfix}.dll"
else "libmsp430${archPostfix}${stdenv.hostPlatform.extensions.sharedLibrary}";
nativeBuildInputs = [ unzip autoPatchelfHook ];
nativeBuildInputs = [ unzip ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ stdenv.cc.cc ];
installPhase = ''

@ -2,8 +2,8 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook makeWrapper ] ++
lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
buildInputs = [ makeWrapper ] ++
lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib

@ -2,8 +2,7 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook ]
++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
buildInputs = lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
patchInstructions = lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir/lib64

@ -48,12 +48,14 @@ buildPythonPackage rec {
doxygen
wxGTK.gtk
pkg-config
] ++ lib.optionals stdenv.isLinux [
autoPatchelfHook
];
buildInputs = [
wxGTK.gtk
ncurses
] ++ lib.optionals stdenv.isLinux [
libXinerama
libSM
libXxf86vm

@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
description = "Semantic code analysis engine";
homepage = "https://codeql.github.com";
maintainers = [ maintainers.dump_stack ];
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
};
}

@ -112,7 +112,8 @@ let
src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
nativeBuildInputs = [ unzip ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ gcc-unwrapped ];
sourceRoot = ".";

@ -112,7 +112,8 @@ let
src = srcDepsSet."java_tools_javac11_${system}-v6.1.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
nativeBuildInputs = [ unzip ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ gcc-unwrapped ];
sourceRoot = ".";

@ -117,7 +117,8 @@ let
src = srcDepsSet."java_tools_javac11_${system}-v10.0.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
nativeBuildInputs = [ unzip ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ gcc-unwrapped ];
sourceRoot = ".";

@ -142,7 +142,8 @@ let
src = srcDepsSet."java_tools_javac11_${system}-v10.6.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
nativeBuildInputs = [ unzip ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ gcc-unwrapped ];
sourceRoot = ".";

@ -66,7 +66,8 @@ stdenv.mkDerivation rec {
};
dontUnpack = true;
nativeBuildInputs = [ autoPatchelfHook installShellFiles makeWrapper ];
nativeBuildInputs = [ installShellFiles makeWrapper ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ stdenv.cc.cc.lib zlib ];
propagatedBuildInputs = [ jre ];

@ -16,7 +16,8 @@ in
stdenv.mkDerivation {
pname = "scala-cli";
inherit version;
nativeBuildInputs = [ autoPatchelfHook installShellFiles ];
nativeBuildInputs = [ installShellFiles ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ coreutils zlib stdenv.cc.cc ];
src =
let
@ -42,9 +43,9 @@ stdenv.mkDerivation {
# We need to call autopatchelf before generating completions
dontAutoPatchelf = true;
postFixup = ''
postFixup = lib.optionalString stdenv.isLinux ''
autoPatchelf $out
'' + ''
# hack to ensure the completion function looks right
# as $0 is used to generate the compdef directive
PATH="$out/bin:$PATH"

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0936hipcl37w4mzzsnjlz4q1z4j9094i4irigzqwg14gdbs7p11s";
});
nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
dontStrip = stdenv.isDarwin;

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1wvy7x56cc7imycf0d83mxcqzdvv56cc0zbp913xgghjn9dl2z7a";
});
nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
dontStrip = stdenv.isDarwin;

@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/rui314/mold";
license = lib.licenses.agpl3Plus;
maintainers = with maintainers; [ nitsky ];
broken = stdenv.isAarch64;
platforms = platforms.unix;
# error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.14 or newer
broken = stdenv.isAarch64 || stdenv.isDarwin;
};
}

@ -130,6 +130,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.signalyst.com/custom.html";
description = "High-end upsampling multichannel software embedded HD-audio player";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lovesegfault ];
};
}

@ -26,7 +26,8 @@ in stdenv.mkDerivation rec {
sha256 = hash;
};
nativeBuildInputs = [ makeWrapper autoPatchelfHook ]
nativeBuildInputs = [ makeWrapper ]
++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
propagatedBuildInputs = [ stdenv.cc.cc zlib krb5 ];

@ -62,9 +62,10 @@ stdenv.mkDerivation (rec {
};
} // optionalAttrs enableUnfree {
dontPatchELF = true;
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
nativeBuildInputs = [ makeWrapper ]
++ optional stdenv.isLinux autoPatchelfHook;
runtimeDependencies = [ zlib ];
postFixup = ''
postFixup = lib.optionalString stdenv.isLinux ''
for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
echo "patching $exe..."
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"

@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
nativeBuildInputs = [ makeWrapper ]
++ optional stdenv.isLinux autoPatchelfHook;
buildInputs = [ jre_headless util-linux zlib ];

@ -18,9 +18,13 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp src/libVirtlyst.so $out/lib
cp src/libVirtlyst${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
cp -r ../root $out
runHook postInstall
'';
patches = [ ./add-admin-password-env.patch ];
@ -29,6 +33,7 @@ stdenv.mkDerivation rec {
description = "Web interface to manage virtual machines with libvirt";
homepage = "https://github.com/cutelyst/Virtlyst";
license = licenses.agpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
};
}

@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [ less ] ++ libraries;
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
nativeBuildInputs = [ makeWrapper ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
installPhase =
let

@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
buildInputs = [ stdenv.cc.cc.lib ];
nativeBuildInputs = [ autoPatchelfHook installShellFiles ];
nativeBuildInputs = [ installShellFiles ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
installPhase = ''
runHook preInstall

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, autoPatchelfHook
@ -79,6 +80,7 @@ in rustPlatform.buildRustPackage rec {
homepage = "https://github.com/casperstorm/ajour";
changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md";
license = licenses.mit;
broken = stdenv.isDarwin;
maintainers = with maintainers; [ hexa ];
};
}

@ -30,9 +30,8 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
];
] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
installPhase =
if stdenv.hostPlatform.system == "x86_64-linux" then

@ -154,6 +154,7 @@ with pkgs;
pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python";
autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py;
};
meta.platforms = lib.platforms.linux;
} ../build-support/setup-hooks/auto-patchelf.sh;
appflowy = callPackage ../applications/office/appflowy { };
@ -842,7 +843,9 @@ with pkgs;
setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh;
fixDarwinDylibNames = makeSetupHook {
name = "fix-darwin-dylib-names-hook";
substitutions = { inherit (binutils) targetPrefix; };
meta.platforms = lib.platforms.darwin;
} ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { };

Loading…
Cancel
Save