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

Merge pull request #28949 from pbogdan/allegro-fix-build

Browse Source 
allegro: fix sandboxed build with nixUnstable
This commit is contained in:
Michael Raskin 2017-09-04 07:39:37 +02:00 committed by GitHub
commit 8f154c139a
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()