Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b916ed31f2d7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f081ccccd17f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 1, 2018

  1. libtorrent-rasterbar: Use Boost supporting Python 

    Since 772eef9, the Boost package
doesn't support Python by default anymore, so we need to override it
with Python support because --enable-python-binding is enabled by
default in libtorrent-rasterbar.

The build of the package now succeeds again on my x86_64-linux machine.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Phreedom
    @aszlig
    aszlig committed Jul 1, 2018
    Copy the full SHA
    f081ccc View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 pkgs/development/libraries/libtorrent-rasterbar/default.nix
9 changes: 6 additions & 3 deletions pkgs/development/libraries/libtorrent-rasterbar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,9 @@
let
version = "1.1.7";
formattedVersion = lib.replaceChars ["."] ["_"] version;

boostPython = boost.override { enablePython = true; };

in stdenv.mkDerivation {
name = "libtorrent-rasterbar-${version}";

@@ -27,15 +30,15 @@ in stdenv.mkDerivation {

enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boost openssl zlib python libiconv geoip ];
buildInputs = [ boostPython openssl zlib python libiconv geoip ];
preConfigure = "./autotool.sh";

configureFlags = [
"--enable-python-binding"
"--with-libgeoip=system"
"--with-libiconv=yes"
"--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib"
"--with-boost=${boostPython.dev}"
"--with-boost-libdir=${boostPython.out}/lib"
"--with-libiconv=yes"
];