public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allegro: fix sandboxed build with nixUnstable

Browse Source 
In Nix 1.12 sandboxed builds are performed in /build/ directory which conflicts
with the regex in docs/CMakeLists.txt, and generated documentation ends up in
wrong directory -> https://hydra.nixos.org/build/53914969/nixlog/1 -> CTRL-F
abi.txt
This commit is contained in:
Piotr Bogdan 2017-09-03 19:12:32 +01:00
parent 2c301b1b48
commit e22a77217d
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/allegro/default.nix
View File

@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
}; };
patches = [
./nix-unstable-sandbox-fix.patch
];
buildInputs = [ buildInputs = [
texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc

13
pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 32ed053..73ba87f 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -72,7 +72,7 @@ foreach(page ${DOC_SRCS})
string(REPLACE "._tx" "" basename ${basename})
set(page ${CMAKE_CURRENT_SOURCE_DIR}/${page})
- if(${page} MATCHES "/build/")
+ if(${page} MATCHES ".+/build/")
set(txt_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.txt)
set(html_out ${CMAKE_CURRENT_BINARY_DIR}/build/${basename}.html)
else()