ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

smpeg: fix build with clang 16

Browse Source 
Apply upstream patches to remove usage of the `register` storage class
specifier, which was removed from C++17 (the default with clang 16).
This commit is contained in:
Randy Eckenrode 2023-11-03 12:32:07 -04:00
parent 80fc3eb8a6
commit ed24081baa
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/smpeg/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
stdenv.mkDerivation rec {
pname = "smpeg";
@ -16,8 +16,24 @@ stdenv.mkDerivation rec {
./gcc6.patch
./libx11.patch
./gtk.patch
# These patches remove use of the `register` storage class specifier,
# allowing smpeg to build with clang 16, which defaults to C++17.
(fetchpatch {
url = "https://github.com/icculus/smpeg/commit/cc114ba0dd8644c0d6205bbce2384781daeff44b.patch";
hash = "sha256-GxSD82j05pw0r2SxmPYAe/BXX4iUc+iHWhB9Ap4GzfA=";
})
(fetchpatch {
url = "https://github.com/icculus/smpeg/commit/b369feca5bf99d6cff50d8eb316395ef48acf24f.patch";
hash = "sha256-U+a6dbc5cm249KlUcf4vi79yUiT4hgEvMv522K4PqUc=";
})
];
postPatch = ''
substituteInPlace video/gdith.cpp \
--replace 'register int' 'int' \
--replace 'register Uint16' 'Uint16'
'';
enableParallelBuilding = true;
nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ];