diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 3fd4273fd49a..1f89610c568b 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -29,8 +29,29 @@ stdenv.mkDerivation rec { hash = "sha256-ll5P8cqJBzoieExElggn5tRbDcmH7L3yvcbtAQ0BBww="; }; + postPatch = '' + # Workaround a CMake bug (we don't generally do distributable bundles in nixpkgs anyway): + # warning: cannot resolve item '/usr/lib/libSystem.B.dylib' + # + # possible problems: + # need more directories? + # need to use InstallRequiredSystemLibraries? + # run in install tree instead of build tree? + for filename in \ + qucs/CMakeLists.txt \ + qucs-transcalc/CMakeLists.txt \ + qucs-attenuator/CMakeLists.txt \ + qucs-s-spar-viewer/CMakeLists.txt \ + ; do + substituteInPlace "$filename" \ + --replace-fail 'fixup_bundle(' 'message(\"nixpkgs will not fixup_bundle: \" ' + done + ''; + nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; - buildInputs = [ qtbase qttools qtcharts qtsvg qtwayland libX11 gperf adms ] ++ kernels; + buildInputs = [ qtbase qttools qtcharts qtsvg gperf adms ] + ++ lib.optionals stdenv.isLinux [ qtwayland libX11 ] + ++ kernels; cmakeFlags = [ "-DWITH_QT6=ON" @@ -56,6 +77,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; mainProgram = "qucs-s"; maintainers = with maintainers; [ mazurel kashw2 thomaslepoix ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix index 9546378e01b2..2602b900e244 100644 --- a/pkgs/by-name/ad/adms/package.nix +++ b/pkgs/by-name/ad/adms/package.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Qucs/adms"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ disassembler ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix index 3667d84b280f..f3ef6f64d18a 100644 --- a/pkgs/by-name/qu/qucsator-rf/package.nix +++ b/pkgs/by-name/qu/qucsator-rf/package.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { hash = "sha256-IvB4CTvK6x4wwUXMoXIqBku1Hh9em6ITTpwFllYsTEg="; }; + # Upstream forces NO_DEFAULT_PATH on APPLE + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail '"/usr/local/opt/bison/bin/"' '"${bison}/bin"' + ''; + nativeBuildInputs = [ cmake flex @@ -43,6 +49,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "qucsator_rf"; maintainers = with lib.maintainers; [ thomaslepoix ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }