diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-02-05 21:13:21 -0200 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2019-02-12 09:03:50 -0200 |
| commit | def579b42b78fd47addebc1cca90f21018500efd (patch) | |
| tree | 2172bb8e44f3eda6cce3f495c4333cd07ad51365 /pkgs/desktops | |
| parent | c4a6b73972b06e024eff344656f5a26932402bf4 (diff) | |
| download | nixlib-def579b42b78fd47addebc1cca90f21018500efd.tar nixlib-def579b42b78fd47addebc1cca90f21018500efd.tar.gz nixlib-def579b42b78fd47addebc1cca90f21018500efd.tar.bz2 nixlib-def579b42b78fd47addebc1cca90f21018500efd.tar.lz nixlib-def579b42b78fd47addebc1cca90f21018500efd.tar.xz nixlib-def579b42b78fd47addebc1cca90f21018500efd.tar.zst nixlib-def579b42b78fd47addebc1cca90f21018500efd.zip | |
liblxqt: 0.13.0 -> 0.14.0
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/lxqt/liblxqt/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/lxqt/libqtxdg/default.nix | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 0762dbad3f87..1b19275ece92 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -2,15 +2,14 @@ qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "liblxqt"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1lbvnx6gg15k7fy1bnv5sjji659f603glblcl8c9psh0m1cjdbll"; + sha256 = "1cpl6sd2fifpflahm8fvrrscrv03sinfm03m7yc1k59y6nsbwi36"; }; nativeBuildInputs = [ @@ -29,13 +28,14 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DPULL_TRANSLATIONS=NO" "-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg" ]; - patchPhase = '' + postPatch = '' sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 96a912e568e8..852c4bddec83 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }: stdenv.mkDerivation rec { - name = "libqtxdg-${version}"; + pname = "libqtxdg"; version = "3.3.0"; src = fetchFromGitHub { owner = "lxqt"; - repo = "libqtxdg"; + repo = pname; rev = version; - sha256 = " got: sha256:0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b"; + sha256 = "0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b"; }; nativeBuildInputs = [ cmake ]; |