diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-05-07 12:02:22 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-07 12:03:24 +0300 |
| commit | 2d577679743b1299a960c31f5ddc54f405fab069 (patch) | |
| tree | a3e0ed1f5c3c587f2f4db1f688a5c3ba176b5e00 | |
| parent | 628c8e89950bc493d5002794323d074dab8e79d2 (diff) | |
| download | nixlib-2d577679743b1299a960c31f5ddc54f405fab069.tar nixlib-2d577679743b1299a960c31f5ddc54f405fab069.tar.gz nixlib-2d577679743b1299a960c31f5ddc54f405fab069.tar.bz2 nixlib-2d577679743b1299a960c31f5ddc54f405fab069.tar.lz nixlib-2d577679743b1299a960c31f5ddc54f405fab069.tar.xz nixlib-2d577679743b1299a960c31f5ddc54f405fab069.tar.zst nixlib-2d577679743b1299a960c31f5ddc54f405fab069.zip | |
openspades-git: drop yet another hack, fix accidential python merge
| -rw-r--r-- | pkgs/development/interpreters/python/3.5/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/games/openspades/git.nix | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 0d844d37963f..4bc39f4c2b3a 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -58,13 +58,8 @@ stdenv.mkDerivation { ''} configureFlagsArray=( --enable-shared --with-threads -<<<<<<< Updated upstream CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" -======= - CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" ->>>>>>> Stashed changes LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix index aeddbf43cdea..8212f160cda8 100644 --- a/pkgs/games/openspades/git.nix +++ b/pkgs/games/openspades/git.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { }; preBuild = '' - cat > Resources/downloadpak.sh unzip -u -o $devPack -d Resources/DevPak ''; |