public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix evaluation after merge in multi-outputs

Browse Source
This commit is contained in:
Luca Bruno 2015-12-14 10:29:29 +01:00
parent 5b0352a6a4
commit bbcf127c7c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
View File

@ -9,6 +9,7 @@ kde {
patches = [ patches = [
(fetchurl { (fetchurl {
name = "kopete.patch";
url = "https://bugs.kde.org/attachment.cgi?id=91567"; url = "https://bugs.kde.org/attachment.cgi?id=91567";
sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1"; sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1";
}) })

3
pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
# This flag should be picked up through pkgconfig, but it isn't. # This flag should be picked up through pkgconfig, but it isn't.
"-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include"
"-fPIC"
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
@ -32,8 +33,6 @@ stdenv.mkDerivation rec {
] ]
++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
NIX_CFLAGS_COMPILE = "-fPIC";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://phonon.kde.org/; homepage = http://phonon.kde.org/;
description = "GStreamer backend for Phonon"; description = "GStreamer backend for Phonon";