summary refs log tree commit diff
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2020-11-21 16:04:36 +0100
committerGitHub <noreply@github.com>2020-11-21 16:04:36 +0100
commitc18b90b5b90bd20c421ffe795420ad501e6613c7 (patch)
treec037a80b962c03ca3d021670598e8c8a386b93d1
parentb054528c8ef1c7a427c44d5868ae3417b411fd3b (diff)
parent2ced276567a6bb40f5de0daa9804373070b7829d (diff)
downloadnixpkgs-c18b90b5b90bd20c421ffe795420ad501e6613c7.tar
nixpkgs-c18b90b5b90bd20c421ffe795420ad501e6613c7.tar.gz
nixpkgs-c18b90b5b90bd20c421ffe795420ad501e6613c7.tar.bz2
nixpkgs-c18b90b5b90bd20c421ffe795420ad501e6613c7.tar.lz
nixpkgs-c18b90b5b90bd20c421ffe795420ad501e6613c7.tar.xz
nixpkgs-c18b90b5b90bd20c421ffe795420ad501e6613c7.tar.zst
nixpkgs-c18b90b5b90bd20c421ffe795420ad501e6613c7.zip
Merge pull request #98462 from raboof/gem-update-to-2020-09-22
gem: 2020-03-26 -> 2020-09-22
-rw-r--r--pkgs/applications/audio/pd-plugins/gem/default.nix18
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix
index 2c0d0a24c57..a44ba689a61 100644
--- a/pkgs/applications/audio/pd-plugins/gem/default.nix
+++ b/pkgs/applications/audio/pd-plugins/gem/default.nix
@@ -15,27 +15,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gem-unstable";
-  # The patch below applies to the latest release (v0.94), but then the build
-  # 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";
+  version = "2020-09-22";
 
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "Gem";
-    rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599";
-    sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy";
+    rev = "2edfde4f0587e72ef325e7f53681936dcc19655b";
+    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 = [
     autoreconfHook
     file