Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2896f00181b6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f2236425b9f2
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 27, 2019

  1. calamares: fix qt path

    @manveru @Lassulus
    manveru authored and Lassulus committed Oct 27, 2019
    Copy the full SHA
    f223642 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/tools/misc/calamares/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/misc/calamares/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
, qtquickcontrols, qtsvg, qttools, qtwebengine, utillinux, glibc, tzdata
, ckbcomp, xkeyboard_config
, ckbcomp, xkeyboard_config, mkDerivation
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "calamares";
version = "3.2.15";

@@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
-i CMakeLists.txt
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "Distribution-independent installer framework";
license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ manveru ];
maintainers = with lib.maintainers; [ manveru ];
platforms = platforms.linux;
};
}