Merge pull request #39983 from ookhoi/fix-way-cooler

way-cooler: renaming commands is not needed anymore
This commit is contained in:
Matthew Justin Bauer 2018-05-05 00:26:55 -05:00 committed by GitHub
commit 938299be17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions

View File

@ -20,24 +20,16 @@ let
mkdir -p $out/etc mkdir -p $out/etc
cp -r config $out/etc/way-cooler cp -r config $out/etc/way-cooler
''; '';
postFixup = ''
cd $out/bin
mv way_cooler way-cooler
'';
}); });
wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec { wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postFixup = '' postFixup = ''
makeWrapper $out/bin/wc_bg $out/bin/wc-bg \ makeWrapper $out/bin/wc-bg $out/bin/wc-bg \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
''; '';
}); });
wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec { wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec {
postFixup = ''
cd $out/bin
mv wc_grab wc-grab
'';
}); });
wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override { wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
crateOverrides = defaultCrateOverrides // { crateOverrides = defaultCrateOverrides // {
@ -47,7 +39,7 @@ let
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postFixup = '' postFixup = ''
makeWrapper $out/bin/wc_lock $out/bin/wc-lock \ makeWrapper $out/bin/wc-lock $out/bin/wc-lock \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
''; '';
}); });