about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2016-09-06 00:30:51 +0200
committerGitHub <noreply@github.com>2016-09-06 00:30:51 +0200
commit52a185e4c32f131eaadd5def2d59b34fd60d5e46 (patch)
treede514eaaf80540cf890eb97fc01b1dcf6be68c6f /pkgs/desktops
parente9a1e7a6d5cdf64cb54974acd738e7a4fce9dca3 (diff)
parent372a56fadbf29b5b65b5754b289c328bbc063655 (diff)
downloadnixlib-52a185e4c32f131eaadd5def2d59b34fd60d5e46.tar
nixlib-52a185e4c32f131eaadd5def2d59b34fd60d5e46.tar.gz
nixlib-52a185e4c32f131eaadd5def2d59b34fd60d5e46.tar.bz2
nixlib-52a185e4c32f131eaadd5def2d59b34fd60d5e46.tar.lz
nixlib-52a185e4c32f131eaadd5def2d59b34fd60d5e46.tar.xz
nixlib-52a185e4c32f131eaadd5def2d59b34fd60d5e46.tar.zst
nixlib-52a185e4c32f131eaadd5def2d59b34fd60d5e46.zip
Merge pull request #18284 from romildo/upd.rage
rage: 0.2.0 -> 0.2.1
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/enlightenment/rage.nix39
1 files changed, 15 insertions, 24 deletions
diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index 9ef557654dc7..a92221050580 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,19 +1,28 @@
-{ stdenv, fetchurl, efl, automake, autoconf, libtool, pkgconfig, gst_all_1
-, makeWrapper, lib }:
+{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rage-${version}";
-  version = "0.2.0";
+  version = "0.2.1";
   
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz";
-    sha256 = "06fxhznwbd5x341r8ml3cpwmvwn0aq9i1akcgclk4vjdqiyff1d9";
+    sha256 = "0xlxb1hmbnqcy088cqpj2i87hsd5h3da7d2f9afiavz0ssw4ll94";
   };
 
   nativeBuildInputs = [
-    automake autoconf libtool pkgconfig makeWrapper
+    pkgconfig
+    wrapGAppsHook
   ];
 
+  buildInputs = [
+    efl
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-libav
+ ];
+
   NIX_CFLAGS_COMPILE = [
     "-I${efl}/include/ecore-con-1"
     "-I${efl}/include/ecore-evas-1"
@@ -29,28 +38,10 @@ stdenv.mkDerivation rec {
     "-I${efl}/include/ethumb-client-1"
   ];
 
-  buildInputs = [
-    efl
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-libav
- ];
-
-  configurePhase = ''
-    ./autogen.sh --prefix=$out
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/rage \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
-  '';
-
   meta = {
     description = "Video + Audio player along the lines of mplayer";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ];
+    maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
   };