diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-09-04 07:39:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-04 07:39:37 +0200 |
| commit | 8f154c139a4b552e01e30a259441621b415644ef (patch) | |
| tree | b8543adcf6920e022156a14edf6975da2d4182cc /pkgs/development | |
| parent | ebce795c5c6d5d156783cff389194ab6e6c7eba5 (diff) | |
| parent | e22a77217d08d6b83431a8ed230f6040881acc58 (diff) | |
| download | nixlib-8f154c139a4b552e01e30a259441621b415644ef.tar nixlib-8f154c139a4b552e01e30a259441621b415644ef.tar.gz nixlib-8f154c139a4b552e01e30a259441621b415644ef.tar.bz2 nixlib-8f154c139a4b552e01e30a259441621b415644ef.tar.lz nixlib-8f154c139a4b552e01e30a259441621b415644ef.tar.xz nixlib-8f154c139a4b552e01e30a259441621b415644ef.tar.zst nixlib-8f154c139a4b552e01e30a259441621b415644ef.zip | |
Merge pull request #28949 from pbogdan/allegro-fix-build
allegro: fix sandboxed build with nixUnstable
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/allegro/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 997a8d223054..c0451486c144 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; + patches = [ + ./nix-unstable-sandbox-fix.patch + ]; + buildInputs = [ texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc diff --git a/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch b/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch new file mode 100644 index 000000000000..a227cea1ce7b --- /dev/null +++ b/pkgs/development/libraries/allegro/nix-unstable-sandbox-fix.patch @@ -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() |