diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-12-14 10:29:29 +0100 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-14 10:29:29 +0100 |
| commit | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (patch) | |
| tree | 755ae78ed552f37463861663acfafa5c998cc8ca | |
| parent | 5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (diff) | |
| download | nixlib-bbcf127c7c9029cba43493d7d25a9d1c65d59152.tar nixlib-bbcf127c7c9029cba43493d7d25a9d1c65d59152.tar.gz nixlib-bbcf127c7c9029cba43493d7d25a9d1c65d59152.tar.bz2 nixlib-bbcf127c7c9029cba43493d7d25a9d1c65d59152.tar.lz nixlib-bbcf127c7c9029cba43493d7d25a9d1c65d59152.tar.xz nixlib-bbcf127c7c9029cba43493d7d25a9d1c65d59152.tar.zst nixlib-bbcf127c7c9029cba43493d7d25a9d1c65d59152.zip | |
Fix evaluation after merge in multi-outputs
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdenetwork/kopete.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix index 267c2b782129..f5750d60045f 100644 --- a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix @@ -9,6 +9,7 @@ kde { patches = [ (fetchurl { + name = "kopete.patch"; url = "https://bugs.kde.org/attachment.cgi?id=91567"; sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1"; }) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix index 08bce2b68eba..9d1e6e728539 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix @@ -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"; |