diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 38b7e040603..5cfd9c7cbe8 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.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 ]; }; } diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/applications/audio/losslessaudiochecker/default.nix index 551f56a3ce1..9fecf7b9ba9 100644 --- a/pkgs/applications/audio/losslessaudiochecker/default.nix +++ b/pkgs/applications/audio/losslessaudiochecker/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/applications/audio/soundwireserver/default.nix index 17660599b68..db8d28989b2 100755 --- a/pkgs/applications/audio/soundwireserver/default.nix +++ b/pkgs/applications/audio/soundwireserver/default.nix @@ -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; }; } diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 3b694e4b151..4f7967c3a34 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -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 ]; }; diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix index d88be436984..0c90b786bac 100644 --- a/pkgs/applications/graphics/pixeluvo/default.nix +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix index e69361dbd93..b206d14323b 100644 --- a/pkgs/applications/misc/foxitreader/default.nix +++ b/pkgs/applications/misc/foxitreader/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index dc50a3b9567..6ed38175eba 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index f7401d36b0e..2caa0dc2280 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -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 ."; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index d2e5beb1718..c63084f3550 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -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" ]; }; } diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/applications/networking/tetrd/default.nix index 94e7950ecdb..937992a63d7 100644 --- a/pkgs/applications/networking/tetrd/default.nix +++ b/pkgs/applications/networking/tetrd/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix index d1f0ab5e8cf..d56db734a88 100644 --- a/pkgs/applications/terminal-emulators/syncterm/default.nix +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -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' }; } diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index f47e447334b..fdea39db94b 100644 --- a/pkgs/development/compilers/dmd/binary.nix +++ b/pkgs/development/compilers/dmd/binary.nix @@ -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 = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix index ee016e71d31..6a86b7e8141 100644 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix @@ -86,7 +86,8 @@ let zlib ]; - nativeBuildInputs = [ unzip perl autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ unzip perl makeWrapper ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; unpackPhase = '' unpack_jar() { diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix index 32b91f5ddfe..ecf5ed50ab3 100644 --- a/pkgs/development/compilers/inklecate/default.nix +++ b/pkgs/development/compilers/inklecate/default.nix @@ -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"; diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index 05928d396c8..dd4d51c81e3 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -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 ]; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 48573c67241..00f18f1238f 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -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 = '' diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 662d997d882..1b961c3f9e4 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -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 = '' diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 9f7d020feaf..d7fe4e92802 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 86bc3b0d009..b6f4a0f1bb1 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 2fc306f8e5f..967562580c6 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -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 = '' diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 536a025d15b..641560f1992 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -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 diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index c39d966959a..52443486bbb 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -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 diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 71f8b2847e3..e5942c17d4c 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -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 diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index a6a95e74e4a..3f22bd7c30b 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -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; }; } diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 0ecf6300eb2..9f2fb8b40f4 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -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 = "."; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index 3adf52ec905..0402fb85f26 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -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 = "."; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 3c71c8cc089..3a5c9e2e76f 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -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 = "."; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 72c971d1334..79bb378534b 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -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 = "."; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 11b25bec381..94e6fc70f7d 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index c045944b773..30fa7f3c658 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -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" diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/development/tools/ccloud-cli/default.nix index 5814ab90e6d..2a3d1de41a1 100644 --- a/pkgs/development/tools/ccloud-cli/default.nix +++ b/pkgs/development/tools/ccloud-cli/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0936hipcl37w4mzzsnjlz4q1z4j9094i4irigzqwg14gdbs7p11s"; }); - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontStrip = stdenv.isDarwin; diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/development/tools/confluent-cli/default.nix index 9664a75703a..059a3272038 100644 --- a/pkgs/development/tools/confluent-cli/default.nix +++ b/pkgs/development/tools/confluent-cli/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1wvy7x56cc7imycf0d83mxcqzdvv56cc0zbp913xgghjn9dl2z7a"; }); - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontStrip = stdenv.isDarwin; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 00bcd3a5f12..ba803afac87 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -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; }; } diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 7b65a789af8..64a5fd18381 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -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 ]; }; } diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index a99349d8c0d..93eab0bd683 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -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 ]; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 56f0779c833..798fa83e6d5 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -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" diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 592cc947a42..b93c9da593f 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -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 ]; diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 3ff42050eb2..d6a72916fae 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -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 ]; }; } diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 4efa2cd88a7..1233b23f3ca 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ less ] ++ libraries; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional stdenv.isLinux autoPatchelfHook; installPhase = let diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index a359beb21ad..5a0d7e51e72 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -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 diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 49fef3edca9..11df34256d4 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -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 ]; }; } diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index d0beb7d40d7..e6f16b93f7d 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -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