diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 10:05:50 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 10:45:22 +0100 |
| commit | 0a2caa41fe0da9e5c36f47994594650f00e1d111 (patch) | |
| tree | e7b9a6f88de8a8c3ee71ed65b2d9257836f9a3a0 /pkgs/tools/misc/calamares/default.nix | |
| parent | f665828fa374580f4b2fd725761d23e18f55e526 (diff) | |
| download | nixpkgs-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar nixpkgs-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.gz nixpkgs-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.bz2 nixpkgs-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.lz nixpkgs-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.xz nixpkgs-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.zst nixpkgs-0a2caa41fe0da9e5c36f47994594650f00e1d111.zip | |
Python: drop `python.majorVersion`
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`. For implementation version, use `python.sourceVersion`. Some expressions were broken. Those that were identified were fixed. fixup major
Diffstat (limited to 'pkgs/tools/misc/calamares/default.nix')
| -rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index c799b08bd44..edc6a2e4643 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; cmakeFlags = [ - "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" + "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DCMAKE_VERBOSE_MAKEFILE=True" "-DCMAKE_BUILD_TYPE=Release" "-DWITH_PYTHONQT:BOOL=ON" |