alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cmplayer: store patch with expression

Browse source
This commit is contained in:
Nikolay Amiantov 2014-09-20 02:27:57 +04:00
parent e81589e2c1
commit e4ce9e98e3
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/video/cmplayer/default.nix
View file

@ -31,11 +31,7 @@ stdenv.mkDerivation rec {
sha256 = "1yppp0jbq3mwa7vq4sjmm2lsqnfcv4n7cjap50gc2bavq7qynr85";
};
patches = [ (fetchpatch {
url = "https://github.com/xylosper/cmplayer/commit/f6de1c7537dc3a0b4c9d69a63653c9bb4af26948.patch";
sha256 = "09ss9bm9z29nqzvdw6a1wv572fl64af1qv55h0wicr6vp0v491h9";
})
];
patches = [ ./fix-gcc48.patch ];
buildInputs = with stdenv.lib;
[ libX11 libxcb qt5 mesa

22
pkgs/applications/video/cmplayer/fix-gcc48.patch Normal file
View file

@ -0,0 +1,22 @@
From f6de1c7537dc3a0b4c9d69a63653c9bb4af26948 Mon Sep 17 00:00:00 2001
From: xylosper <darklin20@gmail.com>
Date: Wed, 2 Jul 2014 11:57:05 +0900
Subject: [PATCH] add a space between user defined literal operator
---
src/cmplayer/stdafx.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cmplayer/stdafx.hpp b/src/cmplayer/stdafx.hpp
index 5f7d49c..c724f08 100644
--- a/src/cmplayer/stdafx.hpp
+++ b/src/cmplayer/stdafx.hpp
@@ -52,7 +52,7 @@ SIA operator "" _q(const char16_t *str, size_t len) -> QString
SIA operator "" _a(const char *str, size_t len) -> QLatin1String
{ return QLatin1String(str, len); }
-SIA operator ""_b(const char *str, size_t len) -> QByteArray
+SIA operator "" _b(const char *str, size_t len) -> QByteArray
{ return QByteArray::fromRawData(str, len); }
SIA operator "" _8(const char *str, size_t len) -> QString