Merge pull request #98462 from raboof/gem-update-to-2020-09-22

gem: 2020-03-26 -> 2020-09-22
This commit is contained in:
Timo Kaufmann 2020-11-21 16:04:36 +01:00 committed by GitHub
commit c18b90b5b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,27 +15,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gem-unstable"; pname = "gem-unstable";
# The patch below applies to the latest release (v0.94), but then the build version = "2020-09-22";
# fails. I didn't track down what changed between that version and the
# current master that fixes the build on Nix
version = "2020-03-26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "umlaeute"; owner = "umlaeute";
repo = "Gem"; repo = "Gem";
rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599"; rev = "2edfde4f0587e72ef325e7f53681936dcc19655b";
sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy"; sha256 = "0k5sq128wxi2qhaidspkw310pdgysxs47agv09pkjgvch2n4d5dq";
}; };
patches = [
# Update autoconf OpenGL/GLU/GLUT detection scripts
# https://github.com/umlaeute/Gem/pull/251
(fetchpatch {
url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff";
sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
file file