Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f75784a33bd8
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da7ddd822e32
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 11, 2020

  1. libfm: fix duplicate inclusion of libfm-extra 

    (cherry picked from commit f5c0535)
    @wamserma
    wamserma committed May 11, 2020
    Copy the full SHA
    02d2ab3 View commit details

  2. Merge pull request #87604 from wamserma/libfm-fix-collision-backport 

    libfm: fix duplicate inclusion of libfm-extra
    @ttuegel
    ttuegel authored May 11, 2020
    Copy the full SHA
    da7ddd8 View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/libraries/libfm/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/libraries/libfm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
"sysconfdir=${placeholder "out"}/etc"
];

# libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
postInstall = optional (!extraOnly) ''
rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {