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: 90b687e11077
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f29c8328760f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 18, 2021

  1. thrift: fix for pkgsStatic

    tobim committed Jan 18, 2021
    Copy the full SHA
    38d4c0b View commit details
  2. Merge pull request #109769 from tobim/pkgs/thrift-fix-static

    thrift: fix for pkgsStatic
    Mic92 authored Jan 18, 2021
    Copy the full SHA
    f29c832 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/libraries/thrift/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/thrift/default.nix
Original file line number Diff line number Diff line change
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
pythonPath = [];

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ boost zlib libevent openssl python bison flex ]
++ stdenv.lib.optional (!static) twisted;
nativeBuildInputs = [ cmake pkgconfig bison flex ];
buildInputs = [ boost zlib libevent openssl ]
++ stdenv.lib.optionals (!static) [ python twisted ];

preConfigure = "export PY_PREFIX=$out";