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

quassel: fix sources

Browse Source 
Fixes changes after #14080 where the updated hash was missing.

Put the source in a common file so there is only one place to update.
This commit is contained in:
zimbatm 2016-03-22 12:08:45 +00:00
parent 3f909d8f64
commit 23b9d037de
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,17 +22,13 @@ assert !buildClient -> !withKDE; # KDE is used by the client only
let let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
source = import ./source.nix { inherit fetchurl; };
in with stdenv; mkDerivation rec { in with stdenv; mkDerivation rec {
inherit (source) src version;
version = "0.12.3";
name = "quassel${tag}-${version}"; name = "quassel${tag}-${version}";
src = fetchurl {
url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb";
};
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = buildInputs =

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

@ -33,25 +33,13 @@ assert !buildClient -> !withKDE; # KDE is used by the client only
let let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
source = import ./source.nix { inherit fetchurl; };
in with stdenv; mkDerivation rec { in with stdenv; mkDerivation rec {
inherit (source) src version;
version = "0.12.3";
name = "quassel${tag}-${version}"; name = "quassel${tag}-${version}";
src = fetchurl {
url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb";
};
patches = [
# fix build with Qt 5.5
(fetchurl {
url = "https://github.com/quassel/quassel/commit/078477395aaec1edee90922037ebc8a36b072d90.patch";
sha256 = "1njwnay7pjjw0g7m0x5cwvck8xcznc7jbdfyhbrd121nc7jgpbc5";
})
];
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = buildInputs =

9
pkgs/applications/networking/irc/quassel/source.nix Normal file
View File

@ -0,0 +1,9 @@
{ fetchurl }:
rec {
version = "0.12.3";
src = fetchurl {
url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "0d6lwf6qblj1ia5j9mjy112zrmpbbg9mmxgscbgxiqychldyjgjd";
};
}