From 4e6676f27d34ee0ad0626ad274db3ae96a59feca Mon Sep 17 00:00:00 2001 From: Dmitry Olyenyov Date: Fri, 3 May 2019 23:30:04 +0300 Subject: [PATCH] pygame: preConfigure fix Upstream moved build scripts to buildconfig folder and added some checks for SDL locations. This breaks `sed` expression that was replacing library paths. Fixes #60893 --- .../development/python-modules/pygame/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index ffd228d9fd1..893b251f7b5 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -25,18 +25,19 @@ buildPythonPackage rec { preConfigure = '' sed \ - -e "s/^origincdirs = .*/origincdirs = []/" \ - -e "s/^origlibdirs = .*/origlibdirs = []/" \ + -e "s/origincdirs = .*/origincdirs = []/" \ + -e "s/origlibdirs = .*/origlibdirs = []/" \ + -e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ -e "/\/include\/smpeg/d" \ - -i config_unix.py + -i buildconfig/config_unix.py ${lib.concatMapStrings (dep: '' sed \ - -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \ - -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \ - -i config_unix.py + -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ + -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ + -i buildconfig/config_unix.py '') buildInputs } - LOCALBASE=/ ${python.interpreter} config.py + LOCALBASE=/ ${python.interpreter} buildconfig/config.py ''; meta = with lib; {