Unverified Commit 20d8be36 authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

pipelight: migrate to by-name, modernize derivation (#500753)

parents 98a8a318 d8cc2892

pkgs/tools/misc/pipelight/default.nix→pkgs/by-name/pi/pipelight/package.nix

+8 −6
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  stdenv_32bit,

  fetchurl,

  bash,

  cabextract,
@@ -9,23 +9,25 @@ 
  libx11,

  libGLU,

  libGL,

  wine-staging,

  pkgsi686Linux,

}:



let

  wine_custom = wine-staging;

  wine_custom = pkgsi686Linux.wine-staging;



  mozillaPluginPath = "/lib/mozilla/plugins";



  stdenv' = stdenv_32bit;



in

stdenv.mkDerivation rec {

stdenv'.mkDerivation (finalAttrs: {



  version = "0.2.8.2";



  pname = "pipelight";



  src = fetchurl {

    url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz";

    url = "https://bitbucket.org/mmueller2012/pipelight/get/v${finalAttrs.version}.tar.gz";

    sha256 = "1kyy6knkr42k34rs661r0f5sf6l1s2jdbphdg89n73ynijqmzjhk";

  };
@@ -90,4 +92,4 @@ stdenv.mkDerivation rec { 
    ];

    mainProgram = "pipelight-plugin";

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -7239,11 +7239,6 @@ with pkgs; 
    physfs

    ;



  pipelight = callPackage ../tools/misc/pipelight {

    stdenv = stdenv_32bit;

    wine-staging = pkgsi686Linux.wine-staging;

  };



  place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;



  podofo = podofo_1_0;