diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-21 10:06:49 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-21 10:06:49 +0000 |
| commit | 58c377b9aa7a54f6e3f216c228a8556dff9a6929 (patch) | |
| tree | e9ca6a025ef64861f161902455515e008d477555 /pkgs/tools/misc/calamares | |
| parent | 3fead71a0e53fabd568495a771ee518ebdb8d051 (diff) | |
kde5.calamares: 1.0 -> 1.1.4.2
fixes build and removes obsolete PIC handling
Diffstat (limited to 'pkgs/tools/misc/calamares')
| -rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index ab00d52c7779b..075f925c92f25 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit, cmake, polkit-qt, libyamlcpp, python, boost, parted +{ stdenv, fetchurl, cmake, polkit-qt, libyamlcpp, python, boost, parted , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart , ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }: stdenv.mkDerivation rec { - name = "calamares-${version}"; - version = "1.0"; - - src = fetchgit { - url = "https://github.com/calamares/calamares.git"; - rev = "dabfb68a68cb012a90cd7b94a22e1ea08f7dd8ad"; - sha256 = "2851ce487aaac61d2df342a47f91ec87fe52ff036227ef697caa7056fe5f188c"; + name = "${pname}-${version}"; + pname = "calamares"; + version = "1.1.4.2"; + + # release including submodule + src = fetchurl { + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "1mh0nmzc3i1aqcj79q2s3vpccn0mirlfbj26sfyb0v6gcrvf707d"; }; buildInputs = [ |