diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-08-26 06:55:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-26 06:55:23 -0400 |
commit | c6c7850321f124aab1708f55976fd96c13c3f8c9 (patch) | |
tree | 3b5cd4c8ffc6330a71c364498be89f00cc9530eb /pkgs/development | |
parent | 780e656e8a6897288ee59e9c5979f8cde49df4f8 (diff) | |
parent | 792c8e8756ca4df76aa1ee0ddd360c8636b6487c (diff) | |
download | nixpkgs-c6c7850321f124aab1708f55976fd96c13c3f8c9.tar nixpkgs-c6c7850321f124aab1708f55976fd96c13c3f8c9.tar.gz nixpkgs-c6c7850321f124aab1708f55976fd96c13c3f8c9.tar.bz2 nixpkgs-c6c7850321f124aab1708f55976fd96c13c3f8c9.tar.lz nixpkgs-c6c7850321f124aab1708f55976fd96c13c3f8c9.tar.xz nixpkgs-c6c7850321f124aab1708f55976fd96c13c3f8c9.tar.zst nixpkgs-c6c7850321f124aab1708f55976fd96c13c3f8c9.zip |
Merge pull request #67483 from jonringer/bump-allegro
allegro: 5.2.4.0 -> 5.2.5.0
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/allegro/5.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 9f8ca69a70f..b267c62d6c7 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "allegro-${version}"; - version = "5.2.4.0"; + pname = "allegro"; + version = "5.2.5.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d"; + sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp"; }; buildInputs = [ @@ -28,14 +28,6 @@ stdenv.mkDerivation rec { libpulseaudio libpthreadstubs ]; - patches = [ - # fix compilation with mesa 18.2.5 - (fetchpatch { - url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch"; - sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m"; - }) - ]; - postPatch = '' sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c ''; |