mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Fix evaluation after merge in multi-outputs
This commit is contained in:
parent
5b0352a6a4
commit
bbcf127c7c
@ -9,6 +9,7 @@ kde {
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
name = "kopete.patch";
|
||||
url = "https://bugs.kde.org/attachment.cgi?id=91567";
|
||||
sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1";
|
||||
})
|
||||
|
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# This flag should be picked up through pkgconfig, but it isn't.
|
||||
"-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include"
|
||||
"-fPIC"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
@ -32,8 +33,6 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fPIC";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://phonon.kde.org/;
|
||||
description = "GStreamer backend for Phonon";
|
||||
|
Loading…
Reference in New Issue
Block a user