From e0464e47880a69896f0fb1810f00e0de469f770a Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 24 Sep 2024 18:50:49 +0300 Subject: treewide: replace `stdenv.is` with `stdenv.hostPlatform.is` In preparation for the deprecation of `stdenv.isX`. These shorthands are not conducive to cross-compilation because they hide the platforms. Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way One example of why this is bad and especially affects compiler packages https://www.github.com/NixOS/nixpkgs/pull/343059 There are too many files to go through manually but a treewide should get users thinking when they see a `hostPlatform.isX` in a place where it doesn't make sense. ``` fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is" fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is" ``` --- pkgs/applications/radio/airspy/default.nix | 2 +- pkgs/applications/radio/csdr/default.nix | 4 ++-- pkgs/applications/radio/cubicsdr/default.nix | 4 ++-- pkgs/applications/radio/direwolf/default.nix | 4 ++-- pkgs/applications/radio/dump1090/default.nix | 2 +- pkgs/applications/radio/fldigi/default.nix | 2 +- pkgs/applications/radio/flex-ndax/default.nix | 2 +- pkgs/applications/radio/freedv/default.nix | 12 ++++++------ pkgs/applications/radio/gnuradio/3.8.nix | 4 ++-- pkgs/applications/radio/gnuradio/default.nix | 4 ++-- pkgs/applications/radio/gnuradio/shared.nix | 4 ++-- pkgs/applications/radio/gnuradio/wrapper.nix | 4 ++-- pkgs/applications/radio/limesuite/default.nix | 2 +- pkgs/applications/radio/m17-cxx-demod/default.nix | 2 +- pkgs/applications/radio/multimon-ng/default.nix | 2 +- pkgs/applications/radio/pat/default.nix | 4 ++-- pkgs/applications/radio/qdmr/default.nix | 2 +- pkgs/applications/radio/qlog/default.nix | 2 +- pkgs/applications/radio/rtl-sdr/default.nix | 2 +- pkgs/applications/radio/sdrplay/default.nix | 6 +++--- pkgs/applications/radio/sdrpp/default.nix | 6 +++--- pkgs/applications/radio/soapyairspy/default.nix | 2 +- pkgs/applications/radio/soapyaudio/default.nix | 4 ++-- pkgs/applications/radio/soapybladerf/default.nix | 2 +- pkgs/applications/radio/soapyhackrf/default.nix | 2 +- pkgs/applications/radio/soapyremote/default.nix | 2 +- pkgs/applications/radio/soapyrtlsdr/default.nix | 2 +- pkgs/applications/radio/soapyuhd/default.nix | 2 +- pkgs/applications/radio/splat/default.nix | 2 +- pkgs/applications/radio/ubertooth/default.nix | 2 +- pkgs/applications/radio/uhd/default.nix | 4 ++-- 31 files changed, 50 insertions(+), 50 deletions(-) (limited to 'pkgs/applications/radio') diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 6cb0f40f129a8..3c1fa511aef77 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; cmakeFlags = - lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; meta = with lib; { homepage = "https://github.com/airspy/airspyone_host"; diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index af05cb61e8362..65bbdbb05dac5 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libsamplerate ]; - hardeningDisable = lib.optional stdenv.isAarch64 "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "format"; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = teams.c3d2.members; }; } diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 839fc9ceaaa14..2677795dc0edf 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libGL libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index e55f895d24af1..6cd591fcbda64 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] - ++ lib.optionals stdenv.isDarwin [ portaudio ] + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ] ++ lib.optionals gpsdSupport [ gpsd ] ++ lib.optionals hamlibSupport [ hamlib ] ++ lib.optionals extraScripts [ python3 perl espeak ]; diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 39c7f832e09f4..c34e18be8696f 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ncurses rtl-sdr soapysdr-with-plugins - ] ++ lib.optional stdenv.isLinux limesuite; + ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option"; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 2390a4f8c0813..0a7edb7aed6ad 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { portaudio libsndfile libsamplerate - ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libpulseaudio alsa-lib udev ]; env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index ff2aedf6005ee..e45604856a59e 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/kc2g-flex-tools/nDAX"; description = "FlexRadio digital audio transport (DAX) connector for PulseAudio"; license = licenses.mit; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 27da63dd40221..d53f67031600f 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -16,7 +16,7 @@ , hamlib_4 , wxGTK32 , sioclient -, pulseSupport ? config.pulseaudio or stdenv.isLinux +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , AppKit , AVFoundation , Cocoa @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace-fail "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ macdylibbundler makeWrapper darwin.autoSignDarwinBinariesHook @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { wxGTK32 sioclient ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AVFoundation Cocoa @@ -74,13 +74,13 @@ stdenv.mkDerivation rec { "-DUSE_PULSEAUDIO:BOOL=${if pulseSupport then "TRUE" else "FALSE"}" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DAPPLE_OLD_XCODE" ]); doCheck = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/FreeDV.app $out/Applications makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 67cc2d6c8ebf8..b611ef66b8250 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -150,8 +150,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index e7efa57428b8b..f9113b0a23c39 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -170,8 +170,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index fe75f6037f375..75a2a97e0d22f 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -88,7 +88,7 @@ in { remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' # Clang references in InstalledDir - + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) '' + + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.hostPlatform.isDarwin) '' remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' ; @@ -116,7 +116,7 @@ in { dontWrapQtApps = true; # On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if # find libgnuradio-runtim.3.*.dylib . - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d) export QT_QPA_PLATFORM=offscreen diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index f468aadb27b5d..4ffe42593ec5d 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -127,7 +127,7 @@ let unwrapped.qt.qtbase.qtPluginPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" @@ -137,7 +137,7 @@ let unwrapped.qt.qtbase.qtQmlPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index d8d7bcd22d0a8..9190896d8e11a 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gnuplot libusb1 soapysdr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ GLUT ] ++ lib.optionals withGui [ fltk diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix index d6663fbc42876..47a7d103e76cc 100644 --- a/pkgs/applications/radio/m17-cxx-demod/default.nix +++ b/pkgs/applications/radio/m17-cxx-demod/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.c3d2.members; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index 70f3da3118c10..f71af7e648625 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-irKpVerxzjJIiLofoTdySk/PzojuVLgMq2DYF0qPaAM="; }; - buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libX11 ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/applications/radio/pat/default.nix index 267be192f44f6..1f1140e5fd4b0 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/applications/radio/pat/default.nix @@ -25,11 +25,11 @@ buildGoModule rec { installShellFiles ]; - buildInputs = lib.optional stdenv.isLinux [ libax25 ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ]; # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 - tags = lib.optionals stdenv.isLinux [ "libax25" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "libax25" ]; postInstall = '' installManPage man/pat-configure.1 man/pat.1 diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 2ebc0d30ff6c2..442828a763028 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -16,7 +16,7 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 86da4b081ee46..dacdfcbb2704c 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { qtwebchannel hamlib qtkeychain - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ cups ]); diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index f0bbba9b0a3ba..6cb25feb980b8 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -13,7 +13,7 @@ let nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ libusb1 ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" "-DWITH_RPC=ON" ]; diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 9d9ee298e09c0..d19ed4b027942 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }: let arch = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isi686 then "i686" - else if stdenv.isAarch64 then "aarch64" + if stdenv.hostPlatform.isx86_64 then "x86_64" + else if stdenv.hostPlatform.isi686 then "i686" + else if stdenv.hostPlatform.isAarch64 then "aarch64" else throw "unsupported architecture"; version = "3.07.1"; diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 3ce8f1f7f4fff..151a967d943ff 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -8,7 +8,7 @@ , hackrf_source ? true, hackrf , limesdr_source ? true, limesuite , perseus_source ? false # needs libperseus-sdr, not yet available in nixpks -, plutosdr_source ? stdenv.isLinux, libiio, libad9361 +, plutosdr_source ? stdenv.hostPlatform.isLinux, libiio, libad9361 , rfspace_source ? true , rtl_sdr_source ? true, rtl-sdr-osmocom, libusb1 # osmocom better w/ rtlsdr v4 , rtl_tcp_source ? true @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glfw glew fftwFloat volk zstd ] - ++ lib.optional stdenv.isDarwin AppKit - ++ lib.optional stdenv.isLinux libX11 + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit + ++ lib.optional stdenv.hostPlatform.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf ++ lib.optional bladerf_source libbladeRF diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 289a20d281ccb..9d198ad15eb35 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ airspy soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index 7434791b69f0b..86921754d6b64 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hamlib rtaudio libjack2 libusb1 soapysdr ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreAudio ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 0f2b445b960e5..15c46507350c2 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbladeRF soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index be621c0d3135e..3f385a4b7255e 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hackrf soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index c6e7cddd0903c..4191b8ae95ceb 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-include sys/select.h" ]); meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 80ea41e4f950f..f0a5194a4a9e8 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 9220df3f5f946..de7b7be855ec6 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ uhd boost soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/applications/radio/splat/default.nix index 59d0fc1fdeb0e..1bf4e738c7138 100644 --- a/pkgs/applications/radio/splat/default.nix +++ b/pkgs/applications/radio/splat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz"; license = licenses.gpl2Only; diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/applications/radio/ubertooth/default.nix index 62e645fb6df81..2d8b9f857938d 100644 --- a/pkgs/applications/radio/ubertooth/default.nix +++ b/pkgs/applications/radio/ubertooth/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbtbb libpcap libusb1 bluez ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=TRUE" "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DUDEV_RULES_GROUP=${udevGroup}" diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 947d7d48108d2..ce668c45300f6 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 - ] ++ optionals stdenv.isAarch32 [ + ] ++ optionals stdenv.hostPlatform.isAarch32 [ "-DCMAKE_CXX_FLAGS=-Wno-psabi" ]; @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # many tests fails on darwin, according to ofborg - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # Build only the host software preConfigure = "cd host"; -- cgit 1.4.1 From f18347fd0705820d375426d985369eddb1b501b8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 23:22:16 +0200 Subject: dablin: fix license --- pkgs/applications/radio/dablin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/radio') diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 5ccce0a2dc369..3f0944c2de027 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Play DAB/DAB+ from ETI-NI aligned stream"; homepage = "https://github.com/Opendigitalradio/dablin"; - license = with licenses; [ gpl3 lgpl21 ]; + license = with licenses; [ gpl3Plus lgpl21Only ]; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; }; -- cgit 1.4.1 From 3392b9135083da26f7ee7d9a3c4a59ac538aa629 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 23:23:32 +0200 Subject: dablin: fix "with lib" in meta --- pkgs/applications/radio/dablin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/radio') diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 3f0944c2de027..6afd108fea2c2 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ]; - meta = with lib; { + meta = { description = "Play DAB/DAB+ from ETI-NI aligned stream"; homepage = "https://github.com/Opendigitalradio/dablin"; - license = with licenses; [ gpl3Plus lgpl21Only ]; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; + license = with lib.licenses; [ gpl3Plus lgpl21Only ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.markuskowa ]; }; } -- cgit 1.4.1 From bd1ce053f2194b40ecf1815b762d879b61c02db6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 23:29:01 +0200 Subject: dablin: apply nixfmt --- pkgs/applications/radio/dablin/default.nix | 34 ++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/radio') diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 6afd108fea2c2..a86a6d505721e 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -1,6 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mpg123, SDL2, gtkmm3, faad2, pcre -} : +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + mpg123, + SDL2, + gtkmm3, + faad2, + pcre, +}: stdenv.mkDerivation rec { pname = "dablin"; @@ -13,16 +22,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ]; + buildInputs = [ + faad2 + mpg123 + SDL2 + gtkmm3 + pcre + ]; meta = { description = "Play DAB/DAB+ from ETI-NI aligned stream"; homepage = "https://github.com/Opendigitalradio/dablin"; - license = with lib.licenses; [ gpl3Plus lgpl21Only ]; + license = with lib.licenses; [ + gpl3Plus + lgpl21Only + ]; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.markuskowa ]; }; } - -- cgit 1.4.1 From 735a134c88ff23f979c900cb0aa04579a705c4b0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 23:31:41 +0200 Subject: dablin: move to pkgs/by-name --- pkgs/applications/radio/dablin/default.nix | 48 ------------------------------ pkgs/by-name/da/dablin/package.nix | 48 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 48 insertions(+), 50 deletions(-) delete mode 100644 pkgs/applications/radio/dablin/default.nix create mode 100644 pkgs/by-name/da/dablin/package.nix (limited to 'pkgs/applications/radio') diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix deleted file mode 100644 index a86a6d505721e..0000000000000 --- a/pkgs/applications/radio/dablin/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - mpg123, - SDL2, - gtkmm3, - faad2, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "dablin"; - version = "1.16.0"; - - src = fetchFromGitHub { - owner = "Opendigitalradio"; - repo = "dablin"; - rev = version; - sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - faad2 - mpg123 - SDL2 - gtkmm3 - pcre - ]; - - meta = { - description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = "https://github.com/Opendigitalradio/dablin"; - license = with lib.licenses; [ - gpl3Plus - lgpl21Only - ]; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.markuskowa ]; - }; -} diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix new file mode 100644 index 0000000000000..a86a6d505721e --- /dev/null +++ b/pkgs/by-name/da/dablin/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + mpg123, + SDL2, + gtkmm3, + faad2, + pcre, +}: + +stdenv.mkDerivation rec { + pname = "dablin"; + version = "1.16.0"; + + src = fetchFromGitHub { + owner = "Opendigitalradio"; + repo = "dablin"; + rev = version; + sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + faad2 + mpg123 + SDL2 + gtkmm3 + pcre + ]; + + meta = { + description = "Play DAB/DAB+ from ETI-NI aligned stream"; + homepage = "https://github.com/Opendigitalradio/dablin"; + license = with lib.licenses; [ + gpl3Plus + lgpl21Only + ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.markuskowa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36909331c8495..8e26a8b4d97f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28947,8 +28947,6 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - dablin = callPackage ../applications/radio/dablin { }; - daktilo = callPackage ../tools/misc/daktilo { }; darcs = haskell.lib.compose.disableCabalFlag "library" -- cgit 1.4.1