Commit d6dbe27e authored by OPNA2608's avatar OPNA2608 Committed by Rick van Schijndel
Browse files

bencodetools: rename from libbencodetools, enable tests

parent d17d1348
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
, which
, makeWrapper
, libao
, libbencodetools
, bencodetools
, sox
, lame
, flac
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    libao
    libbencodetools
    bencodetools
    sox
    lame
    flac
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
  ];

  configureFlags = [
    "--bencode-tools-prefix=${libbencodetools}"
    "--bencode-tools-prefix=${bencodetools}"
  ];

  enableParallelBuilding = true;
+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
}:

stdenv.mkDerivation rec {
  pname = "libbencodetools";
  pname = "bencodetools";
  version = "unstable-2022-05-11";

  src = fetchFromGitLab {
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
    python3
  ];

  # installCheck instead of check due to -install_name'd library on Darwin
  doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform;
  installCheckTarget = "check";

  meta = with lib; {
    description = "Collection of tools for manipulating bencoded data";
    homepage = "https://gitlab.com/heikkiorsila/bencodetools";
+1 −0
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ mapAliases ({
  letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22
  libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22
  libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
  libbencodetools = bencodetools; # Added 2022-07-30
  libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14
  libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
  libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22
+2 −2
Original line number Diff line number Diff line
@@ -17348,6 +17348,8 @@ with pkgs;
  belr = callPackage ../development/libraries/belr { };
  bencodetools = callPackage ../development/libraries/bencodetools { };
  beignet = callPackage ../development/libraries/beignet {
    inherit (llvmPackages_6) libllvm libclang;
  };
@@ -18944,8 +18946,6 @@ with pkgs;
  libbde = callPackage ../development/libraries/libbde { };
  libbencodetools = callPackage ../development/libraries/libbencodetools { };
  libbdplus = callPackage ../development/libraries/libbdplus { };
  libblockdev = callPackage ../development/libraries/libblockdev { };