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: ef37abe0ab6e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e70e009200a
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 5, 2019

  1. pythonPackages.libarcus: use pkgs.protobuf as input 

    This commit makes pkgs.protobuf the input for libarcus, since the latter
searches for the native protobuf library and not for the Python module.

(cherry picked from commit 6a523a1)
    @jokogr
    jokogr authored and Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    64cf235 View commit details

  2. curaengine: add protobuf in buildInputs 

    (cherry picked from commit c14eed2)
    @jokogr
    jokogr authored and Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    9e70e00 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −2 pkgs/applications/misc/curaengine/default.nix
  2. +2 −1 pkgs/development/python-modules/libarcus/default.nix
  3. +1 −1 pkgs/top-level/python-packages.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/curaengine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb, protobuf }:

stdenv.mkDerivation rec {
name = "curaengine-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ cmake ];
buildInputs = [ libarcus stb ];
buildInputs = [ libarcus stb protobuf ];

cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];

3 changes: 2 additions & 1 deletion pkgs/development/python-modules/libarcus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,9 @@ buildPythonPackage rec {

disabled = pythonOlder "3.4.0";

propagatedBuildInputs = [ sip protobuf ];
propagatedBuildInputs = [ sip ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];

postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2968,7 +2968,7 @@ in {

fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };

libarcus = callPackage ../development/python-modules/libarcus { };
libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };

libcloud = callPackage ../development/python-modules/libcloud { };