Skip to content
This repository

adding pygame.patch #134

Closed
wants to merge 1 commit into from

4 participants

Marc Weber Michael Raskin viric Peter Simons
Marc Weber

No description provided.

Marc Weber

This fixes breakage of #133

Michael Raskin
Collaborator

Does the current state of pygame expression work?

Marc Weber

Yes - it works. It got removed by Peter within 2 hours or such. Probably I should resubmit it along with plover after having done some more testing on plover (still waiting for a new keyboard ..)

viric
Collaborator

What is this pull-request about?

viric
Collaborator

For what I understood, Marc proposed a change in #133, which was incorrect (10b3a56). Then Marc fixed it in this pull request, but Peter reverted the merge of #133 in 310c7be and then this pull request doesn't apply trivially anymore.

Peter Simons
Collaborator

The expression doesn't build after this patch has been applied. The problem is that it adds a section

patchPhase = ''
  sed -i 's@raw_input(.*@"1"@' config_unix.py
  unset patchPhase
  patchPhase
'';

to the gcovr expression, but that package doesn't contain a file called config_unix.py, so sed exits with a non-zero error code. Also, the path to the actual patch file still isn't correct. @MarcWeber, I think it would be best if you'd re-test this patch and submit a new pull request once you're sure that the change works fine.

Peter Simons peti closed this February 21, 2013
Moritz Ulrich the-kenny referenced this pull request from a commit in the-kenny/nixpkgs July 24, 2013
Moritz Ulrich Last update to emacsPackages.
This set of Emacs packages corresponds to evaluation #134 of next on
http://hydra.tarn-vedra.de. It contains 914 successfully build
packages and 102 failures (mostly invalid package declarations).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
d90eab5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Sep 27, 2012
Marc Weber adding pygame.patch 864f0ce
This page is out of date. Refresh to see the latest.
17  pkgs/development/python-modules/pygame.patch
... ...
@@ -0,0 +1,17 @@
  1
+diff --git a/config_unix.py b/config_unix.py
  2
+index a95c951..0e5c8b3 100644
  3
+--- a/config_unix.py
  4
++++ b/config_unix.py
  5
+@@ -159,10 +159,8 @@ def main():
  6
+     else:
  7
+         incdirs = []
  8
+         libdirs = []
  9
+-    incdirs += ["/usr"+d for d in origincdirs]
  10
+-    libdirs += ["/usr"+d for d in origlibdirs]
  11
+-    incdirs += ["/usr/local"+d for d in origincdirs]
  12
+-    libdirs += ["/usr/local"+d for d in origlibdirs]
  13
++    incdirs += [x[2:] for x in os.environ['NIX_CFLAGS_COMPILE'].split(" ") if x[0:2] == "-I"]
  14
++    libdirs += [x[2:] for x in os.environ['NIX_LDFLAGS'].split(" ") if x[0:2] == "-L"]
  15
+ 
  16
+     for arg in DEPS[0].cflags.split():
  17
+         if arg[:2] == '-I':
4  pkgs/top-level/python-packages.nix
@@ -790,7 +790,9 @@ let pythonPackages = python.modules // rec {
790 790
       url = http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz;
791 791
       sha256 = "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52";
792 792
     };
793  
-    patches = [ ./pygame.patch ];
  793
+
  794
+    patches = [ ./development/python-modules/pygame.patch ];
  795
+
794 796
     # auto confirming missing dependencies:
795 797
     # PORTMIDI and PORTTIME still missing
796 798
     patchPhase = ''
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.