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

Merge pull request #13814 from Profpatsch/quassel-static

Browse Source 
quasselDaemon: option for static linking
This commit is contained in:
Thomas Tuegel 2016-03-10 10:00:41 -06:00
commit f21ed7a86a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -5,6 +5,7 @@
, tag ? "" # tag added to the package name , tag ? "" # tag added to the package name
, withKDE ? stdenv.isLinux # enable KDE integration , withKDE ? stdenv.isLinux # enable KDE integration
, kdelibs ? null , kdelibs ? null
, static ? false # link statically
, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }: , stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }:
@ -42,8 +43,8 @@ in with stdenv; mkDerivation rec {
NIX_CFLAGS_COMPILE = "-fPIC"; NIX_CFLAGS_COMPILE = "-fPIC";
cmakeFlags = [ cmakeFlags = [
"-DEMBED_DATA=OFF" "-DEMBED_DATA=OFF" ]
"-DSTATIC=OFF" ] ++ edf static "STATIC"
++ edf monolithic "WANT_MONO" ++ edf monolithic "WANT_MONO"
++ edf daemon "WANT_CORE" ++ edf daemon "WANT_CORE"
++ edf client "WANT_QTCLIENT" ++ edf client "WANT_QTCLIENT"

3
pkgs/applications/networking/irc/quassel/qt-5.nix
View File

@ -3,6 +3,7 @@
, client ? false # build Quassel client , client ? false # build Quassel client
, previews ? false # enable webpage previews on hovering over URLs , previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name , tag ? "" # tag added to the package name
, static ? false # link statically
, stdenv, fetchurl, cmake, makeWrapper, dconf , stdenv, fetchurl, cmake, makeWrapper, dconf
, qtbase, qtscript, qtwebkit , qtbase, qtscript, qtwebkit
@ -66,9 +67,9 @@ in with stdenv; mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DEMBED_DATA=OFF" "-DEMBED_DATA=OFF"
"-DSTATIC=OFF"
"-DUSE_QT5=ON" "-DUSE_QT5=ON"
] ]
++ edf static "STATIC"
++ edf monolithic "WANT_MONO" ++ edf monolithic "WANT_MONO"
++ edf daemon "WANT_CORE" ++ edf daemon "WANT_CORE"
++ edf client "WANT_QTCLIENT" ++ edf client "WANT_QTCLIENT"