From 434bb4d090db77c495c1bb2bcf9bb97447b42b0a Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 18 Feb 2023 20:21:19 +0100 Subject: [PATCH] librtlsdr: remove Removing librtlsdr because it's the same exact package as rtl-sdr. --- pkgs/applications/radio/rtl-sdr/default.nix | 4 +- .../libraries/librtlsdr/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/libraries/librtlsdr/default.nix diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index d8180750c7a1..722a0565e0de 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "librtlsdr"; repo = "librtlsdr"; rev = "v${version}"; - sha256 = "1fgxlkgmdchbrf0nn98ivjr6css5hak3608nr4xrf2qzf7xy2kdk"; + hash = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; }; postPatch = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libusb1 ]; + propagatedBuildInputs = [ libusb1 ]; cmakeFlags = lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" diff --git a/pkgs/development/libraries/librtlsdr/default.nix b/pkgs/development/libraries/librtlsdr/default.nix deleted file mode 100644 index c09575924a0a..000000000000 --- a/pkgs/development/libraries/librtlsdr/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "librtlsdr"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "librtlsdr"; - repo = "librtlsdr"; - rev = "v${version}"; - sha256 = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" - - substituteInPlace rtl-sdr.rules \ - --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' - ''; - - nativeBuildInputs = [ pkg-config cmake ]; - - propagatedBuildInputs = [ libusb1 ]; - - meta = with lib; { - description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = "https://github.com/librtlsdr/librtlsdr"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1918a640d163..861f4b002fb1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -814,6 +814,7 @@ mapAliases ({ libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 libsForQt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ef1f7c2bd16..9dd674ec0330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32768,9 +32768,7 @@ with pkgs; rtl-ais = callPackage ../applications/radio/rtl-ais { }; - # librtlsdr is a friendly fork with additional features rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; - librtlsdr = callPackage ../development/libraries/librtlsdr { }; rubyripper = callPackage ../applications/audio/rubyripper {};