Commit d8f7f6a5 authored by Jan Malakhovski's avatar Jan Malakhovski
Browse files

treewide: noop: refer to `src.name` or similar in `sourceRoot` where... 

treewide: noop: refer to `src.name` or similar in `sourceRoot` where appropriate, part 2: the non-trivial cases
parent 5852f26b

pkgs/applications/misc/johnny-reborn/with-data.nix

+19 −21
Original line number Diff line number Diff line
@@ -6,11 +6,7 @@ 
, makeWrapper

}:



stdenvNoCC.mkDerivation {

  pname = "johnny-reborn";

  inherit (johnny-reborn-engine) version;



  srcs =

let

  sounds = fetchFromGitHub {

    owner = "nivs1978";
@@ -26,14 +22,16 @@ stdenvNoCC.mkDerivation { 
    stripRoot = false;

  };

in

    [

      sounds

      resources

    ];



stdenvNoCC.mkDerivation {

  pname = "johnny-reborn";

  inherit (johnny-reborn-engine) version;



  srcs = [ sounds resources ];



  nativeBuildInputs = [ makeWrapper ];



  sourceRoot = "source";

  sourceRoot = sounds.name;



  dontConfigure = true;

  dontBuild = true;

pkgs/applications/version-management/gitqlient/default.nix

+42 −38
Original line number Diff line number Diff line
@@ -6,48 +6,52 @@ 
, gitUpdater

}:



mkDerivation rec {

let

  pname = "gitqlient";

  version = "1.5.0";



  srcs = [

    (fetchFromGitHub {

  main_src = fetchFromGitHub {

    owner = "francescmm";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw=";

    })

    (fetchFromGitHub rec {

  };

  aux_src = fetchFromGitHub rec {

    owner = "francescmm";

    repo = "AuxiliarCustomWidgets";

    rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1";

    sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA=";

    name = repo;

    })

    (fetchFromGitHub rec {

  };

  qlogger_src = fetchFromGitHub rec {

    owner = "francescmm";

    repo = "QLogger";

    rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f";

    sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4=";

    name = repo;

    })

    (fetchFromGitHub rec {

  };

  qpinnabletab_src = fetchFromGitHub rec {

    owner = "francescmm";

    repo = "QPinnableTabWidget";

    rev = "cc937794e910d0452f0c07b4961c6014a7358831";

    sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE=";

    name = repo;

    })

    (fetchFromGitHub rec {

  };

  git_src = fetchFromGitHub rec {

    owner = "francescmm";

    repo = "git";

    rev = "b62750f4da4b133faff49e6f53950d659b18c948";

    sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs=";

    name = repo;

    })

  ];

  };

in



mkDerivation rec {

  inherit pname version;



  srcs = [ main_src aux_src qlogger_src qpinnabletab_src git_src ];



  sourceRoot = "source";

  sourceRoot = main_src.name;



  nativeBuildInputs = [

    qmake

pkgs/data/themes/mojave/default.nix

+23 −22
Original line number Diff line number Diff line
@@ -21,38 +21,39 @@ 
}:



let

  pname = "mojave-gtk-theme";

in

lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] buttonSizeVariants

lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants

lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants

lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants

lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants



stdenvNoCC.mkDerivation rec {

  inherit pname;

  pname = "mojave-gtk-theme";

  version = "2023-06-13";



  srcs = [

    (fetchFromGitHub {

  main_src = fetchFromGitHub {

    owner = "vinceliuice";

    repo = pname;

    rev = version;

    hash = "sha256-0jb/VQ6Z0BGaEka57BWM0pBweP08cr4jfPRdEN/BJ1M=";

    })

  ]

  ++

  lib.optional wallpapers

    (fetchFromGitHub {

  };



  wallpapers_src = fetchFromGitHub {

    owner = "vinceliuice";

    repo = pname;

    rev = "0c4ae6ddff7e3fab4959469461c4d4042deb1b2f";

    hash = "sha256-7LSZSsRt6zTVPLWzuBgwRC1q1MHp5pN/pMl3x2wR8Ow=";

    name = "wallpapers";

    })

  ;

  };



in



lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] buttonSizeVariants

lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants

lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants

lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants

lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants



stdenvNoCC.mkDerivation rec {

  inherit pname version;



  srcs = [ main_src ] ++ lib.optional wallpapers wallpapers_src;



  sourceRoot = "source";

  sourceRoot = main_src.name;



  nativeBuildInputs = [

    glib

pkgs/development/haskell-modules/configuration-tensorflow.nix

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ let 


  setTensorflowSourceRoot = dir: drv:

    (overrideCabal (drv: { src = tensorflow-haskell; }) drv)

      .overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";});

      .overrideAttrs (_oldAttrs: { sourceRoot = "${tensorflow-haskell.name}/${dir}"; });

in

{

  tensorflow-proto = doJailbreak (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto);

pkgs/games/endgame-singularity/default.nix

+19 −15
Original line number Diff line number Diff line
@@ -6,24 +6,28 @@ 
, enableDefaultMusicPack ? true

}:



python3.pkgs.buildPythonApplication rec {

let

  pname = "endgame-singularity";

  version = "1.00";



  srcs = [

    (fetchFromGitHub {

  main_src = fetchFromGitHub {

    owner = "singularity";

    repo = "singularity";

    rev = "v${version}";

    sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl";

    })

  ] ++ lib.optional enableDefaultMusicPack (

    fetchurl {

  };



  music_src = fetchurl {

    url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip";

    sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb";

    }

  );

  sourceRoot = "source";

  };

in



python3.pkgs.buildPythonApplication rec {

  inherit pname version;



  srcs = [ main_src ] ++ lib.optional enableDefaultMusicPack music_src;

  sourceRoot = main_src.name;



  nativeBuildInputs = [ unzip ]; # The music is zipped

  propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ];