Skip to content

Commit

Permalink
survey: Fix python overlay being wrong.
Browse files Browse the repository at this point in the history
Using `pkgs.python27` instead of `previous.python27` was totally wrong,
that stops overlays from working correctly.
Not sure what I was thinking when I wrote that.

Fixes `pkgs.fontforge` failing to link with weird glibc error via python
as shown in NixOS/nixpkgs#66598.
  • Loading branch information
nh2 committed Aug 14, 2019
1 parent 451fba1 commit 1a62682
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions survey/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let
cython-disable-tests-overlay = pkgs: final: previous: {
python27 = pkgs.python27.override {
cython-disable-tests-overlay = final: previous: {
python27 = previous.python27.override {
packageOverrides = self: super: {
cython = super.cython.overridePythonAttrs (old: rec {
# TODO Remove once Cython tests are no longer flaky. See
Expand Down Expand Up @@ -28,7 +28,7 @@ in
# Note that we must NOT use something like `import normalPkgs.path {}`.
# It is bad because it removes previous overlays.
pkgs ? (normalPkgs.appendOverlays [
(cython-disable-tests-overlay normalPkgs)
cython-disable-tests-overlay
])."${approach}",

# When changing this, also change the default version of Cabal declared below
Expand Down

0 comments on commit 1a62682

Please sign in to comment.